summaryrefslogtreecommitdiffstats
path: root/cobbler/collection_repos.py
diff options
context:
space:
mode:
Diffstat (limited to 'cobbler/collection_repos.py')
-rw-r--r--cobbler/collection_repos.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/cobbler/collection_repos.py b/cobbler/collection_repos.py
index 8ce150d4..3b2c1c20 100644
--- a/cobbler/collection_repos.py
+++ b/cobbler/collection_repos.py
@@ -56,7 +56,7 @@ class Repos(collection.Collection):
if obj is not None:
if with_delete:
if with_triggers:
- self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/repo/pre/*")
+ self._run_triggers(self.config.api, obj, "/var/lib/cobbler/triggers/delete/repo/pre/*")
del self.listing[name]
self.config.serialize_delete(self, obj)
@@ -64,12 +64,16 @@ class Repos(collection.Collection):
if with_delete:
self.log_func("deleted repo %s" % name)
if with_triggers:
- self._run_triggers(obj, "/var/lib/cobbler/triggers/delete/repo/post/*")
+ self._run_triggers(self.config.api, obj, "/var/lib/cobbler/triggers/delete/repo/post/*")
path = "/var/www/cobbler/repo_mirror/%s" % obj.name
if os.path.exists(path):
utils.rmtree(path)
+ if with_delete and not self.api.is_cobblerd:
+ self.api._internal_cache_update("repo", name, remove=True)
+
return True
- raise CX(_("cannot delete an object that does not exist: %s") % name)
+ #if not recursive:
+ # raise CX(_("cannot delete an object that does not exist: %s") % name)