From 3673e98fdf97f77c2f66d5c14e60dddc5b1fe349 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Wed, 6 Jun 2007 17:53:24 -0400 Subject: This is Adam Rosenwald's patch for seperating triggers into pre and post triggers, plus my modifications to make them deal with return codes. --- cobbler/collection_systems.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cobbler/collection_systems.py') diff --git a/cobbler/collection_systems.py b/cobbler/collection_systems.py index 4eff2fb..952fdba 100644 --- a/cobbler/collection_systems.py +++ b/cobbler/collection_systems.py @@ -50,9 +50,10 @@ class Systems(collection.Collection): """ if self.find(name): if with_delete: + self._run_triggers(self.listing[name], "/var/lib/cobbler/triggers/delete/system/pre/*") lite_sync = action_litesync.BootLiteSync(self.config) lite_sync.remove_single_system(name) - self._run_triggers(self.listing[name], "/var/lib/cobbler/triggers/delete/system/*") + self._run_triggers(self.listing[name], "/var/lib/cobbler/triggers/delete/system/post/*") del self.listing[name] return True raise CX(_("cannot delete an object that does not exist")) -- cgit