Interim checkin while straightening out exceptions. The last_error bit reminded me of the

thing I hated most about Microsoft SDK/DDK programming (that being, last_error and inconsistant
error handling), so it had to go.

1 files changed, 3 insertions, 5 deletions

diff --git a/cobbler/collection.py b/cobbler/collection.py
index 24a2691..607b344 100644
--- a/cobbler/collection.py
+++ b/cobbler/collection.py
@@ -8,7 +8,7 @@ import exceptions
 
 import serializable
 import utils
-import msg
+import cobbler_msg
 
 class Collection(serializable.Serializable):
 
@@ -70,9 +70,7 @@ class Collection(serializable.Serializable):
         won't be added to the collection).
         """
         if ref is None or not ref.is_valid():
-            if utils.last_error() is None or utils.last_error() == "":
-                utils.set_error("bad_param")
-            return False
+            raise CobblerException("bad_param")
         self.listing[ref.name] = ref
         return True
 
@@ -87,7 +85,7 @@ class Collection(serializable.Serializable):
         if len(values) > 0:
            return "\n\n".join(values)
         else:
-           return msg.m("empty_list")
+           return cobbler_msg.lookup("empty_list")
 
     def __iter__(self):
         """