diff options
| -rw-r--r-- | cobbler/collection_distros.py | 6 | ||||
| -rw-r--r-- | cobbler/collection_profiles.py | 2 | ||||
| -rw-r--r-- | cobbler/collection_repos.py | 2 | ||||
| -rw-r--r-- | cobbler/collection_systems.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cobbler/collection_distros.py b/cobbler/collection_distros.py index 5f54881..b696738 100644 --- a/cobbler/collection_distros.py +++ b/cobbler/collection_distros.py @@ -43,13 +43,13 @@ class Distros(collection.Collection): obj = self.find(name=name) if obj is not None: if with_delete: - self._run_triggers(self.listing[name], "/var/lib/cobbler/triggers/delete/distro/pre/*") + self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/distro/pre/*") lite_sync = action_litesync.BootLiteSync(self.config) lite_sync.remove_single_profile(name) + del self.listing[name] self.config.serialize_delete(self, obj) if with_delete: - self._run_triggers(self.listing[name], "/var/lib/cobbler/triggers/delete/distro/post/*") - del self.listing[name] + self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/distro/post/*") return True raise CX(_("cannot delete object that does not exist")) diff --git a/cobbler/collection_profiles.py b/cobbler/collection_profiles.py index 7e71ec1..b878ff9 100644 --- a/cobbler/collection_profiles.py +++ b/cobbler/collection_profiles.py @@ -46,10 +46,10 @@ class Profiles(collection.Collection): self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/profile/pre/*") lite_sync = action_litesync.BootLiteSync(self.config) lite_sync.remove_single_profile(name) + del self.listing[name] self.config.serialize_delete(self, obj) if with_delete: self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/profile/post/*") - del self.listing[name] return True raise CX(_("cannot delete an object that does not exist")) diff --git a/cobbler/collection_repos.py b/cobbler/collection_repos.py index d1ec55d..56ecec4 100644 --- a/cobbler/collection_repos.py +++ b/cobbler/collection_repos.py @@ -49,10 +49,10 @@ class Repos(collection.Collection): if with_delete: self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/repo/pre/*") # FIMXE: clean up repo config files? + del self.listing[name] self.config.serialize_delete(self, obj) if with_delete: self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/repo/post/*") - del self.listing[name] return True raise CX(_("cannot delete an object that does not exist")) diff --git a/cobbler/collection_systems.py b/cobbler/collection_systems.py index 2582dfb..a871f9a 100644 --- a/cobbler/collection_systems.py +++ b/cobbler/collection_systems.py @@ -46,10 +46,10 @@ class Systems(collection.Collection): self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/system/pre/*") lite_sync = action_litesync.BootLiteSync(self.config) lite_sync.remove_single_system(name) + del self.listing[name] self.config.serialize_delete(self, obj) if with_delete: self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/system/post/*") - del self.listing[name] return True raise CX(_("cannot delete an object that does not exist")) |