From 068fe0df24740772c1a588ec62d5673383a8e880 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 23 Aug 2007 12:12:42 -0400 Subject: Some code to fix a reference issue that allowed for hash value propogation up the graph, in ksmeta and possibly kopts. Also added some code to check to make sure an object of the wrong type never gets added to the wrong collection. --- cobbler/item_system.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cobbler/item_system.py') diff --git a/cobbler/item_system.py b/cobbler/item_system.py index 3575d79..445cf73 100644 --- a/cobbler/item_system.py +++ b/cobbler/item_system.py @@ -21,6 +21,7 @@ from rhpl.translate import _, N_, textdomain, utf8 class System(item.Item): TYPE_NAME = _("system") + COLLECTION_TYPE = "system" def make_clone(self): ds = self.to_datastruct() @@ -70,9 +71,9 @@ class System(item.Item): # backwards compatibility -- convert string entries to dicts for storage # this allows for better usage from the API. - if type(self.kernel_options) != dict: + if self.kernel_options != "<>" and type(self.kernel_options) != dict: self.set_kernel_options(self.kernel_options) - if type(self.ks_meta) != dict: + if self.ks_meta != "<>" and type(self.ks_meta) != dict: self.set_ksmeta(self.ks_meta) # backwards compatibility -- if name is an IP or a MAC, set appropriate fields -- cgit