diff options
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/collection.py | 10 | ||||
| -rw-r--r-- | cobbler/commands.py | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/cobbler/collection.py b/cobbler/collection.py index 1b509f2..6044993 100644 --- a/cobbler/collection.py +++ b/cobbler/collection.py @@ -100,7 +100,7 @@ class Collection(serializable.Serializable): self.add(item) - def rename(self,ref,newname,with_sync=True,with_triggers=False): + def rename(self,ref,newname,with_sync=True,with_triggers=True): """ Allows an object "ref" to be given a newname without affecting the rest of the object tree. @@ -110,7 +110,7 @@ class Collection(serializable.Serializable): oldname = ref.name newref = ref.make_clone() newref.set_name(newname) - self.add(newref) + self.add(newref, with_triggers=with_triggers,save=True) # now descend to any direct ancestors and point them at the new object allowing # the original object to be removed without orphanage. Direct ancestors @@ -126,17 +126,17 @@ class Collection(serializable.Serializable): k.set_parent(newname) else: k.set_distro(newname) - self.api.profiles().add(k, save=True, with_sync=with_sync, with_triggers=with_triggers) + self.api.profiles().add(k, save=True, with_sync=with_sync, with_triggers=with_triggers,save=True) elif k.COLLECTION_TYPE == "system": k.set_profile(newname) - self.api.systems().add(k, save=True, with_sync=with_sync, with_triggers=with_triggers) + self.api.systems().add(k, save=True, with_sync=with_sync, with_triggers=with_triggers,save=True) elif k.COLLECTION_TYPE == "repo": raise CX(_("internal error, not expected to have repo child objects")) else: raise CX(_("internal error, unknown child type (%s), cannot finish rename" % k.COLLECTION_TYPE)) # now delete the old version - self.remove(oldname, with_delete=True) + self.remove(oldname, with_delete=True, with_triggers=with_triggers) return True diff --git a/cobbler/commands.py b/cobbler/commands.py index 705249d..c6eec6e 100644 --- a/cobbler/commands.py +++ b/cobbler/commands.py @@ -258,7 +258,7 @@ class CobblerFunction: if "add" in self.args: clobber = options.clobber - if "copy" in self.args: # or "rename" in self.args: + if "copy" in self.args: if self.options.newname: obj = obj.make_clone() obj.set_name(self.options.newname) @@ -298,14 +298,12 @@ class CobblerFunction: check_dup = False if not "copy" in self.args: check_dup = True - # FIXME: this ensures duplicate prevention on copy, but not - # rename? rc = collect_fn().add(obj, save=True, with_sync=opt_sync, with_triggers=opt_triggers, check_for_duplicate_netinfo=check_dup) else: # we are renaming here, so duplicate netinfo checks also # need to be made.(FIXME) - rc = collect_fn().rename(obj, self.options.newname) + rc = collect_fn().rename(obj, self.options.newname, with_triggers=opt_triggers) return rc |