diff options
| author | Peter Vreman <peter.vreman@acision.com> | 2009-09-14 09:49:51 +0200 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2009-09-16 12:00:05 -0400 |
| commit | ca44e2fb642099afed4e1dcd1e5d38b6b41a050e (patch) | |
| tree | 4375366a8f4db271ac81cf74bd44fa31d8d735da | |
| parent | 0d91dcc6e1130dcd16a329b5df0ee8442afe04a5 (diff) | |
| download | cobbler-ca44e2fb642099afed4e1dcd1e5d38b6b41a050e.tar.gz cobbler-ca44e2fb642099afed4e1dcd1e5d38b6b41a050e.tar.xz cobbler-ca44e2fb642099afed4e1dcd1e5d38b6b41a050e.zip | |
duplication checks in set_dns/mac/hostname are skipped if the field is empty
| -rw-r--r-- | cobbler/item_system.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cobbler/item_system.py b/cobbler/item_system.py index ed75deab..3061f20b 100644 --- a/cobbler/item_system.py +++ b/cobbler/item_system.py @@ -246,7 +246,7 @@ class System(item.Item): intf = self.__get_interface(interface) # FIXME: move duplicate supression code to the object validation # functions to take a harder line on supression? - if not str(self.config._settings.allow_duplicate_hostnames).lower() in [ "1", "y", "yes"]: + if dns_name != "" and not str(self.config._settings.allow_duplicate_hostnames).lower() in [ "1", "y", "yes"]: matched = self.config.api.find_items("system", {"dns_name" : dns_name}) for x in matched: if x.name != self.name: @@ -282,7 +282,7 @@ class System(item.Item): # FIXME: move duplicate supression code to the object validation # functions to take a harder line on supression? - if not str(self.config._settings.allow_duplicate_ips).lower() in [ "1", "y", "yes"]: + if address != "" and not str(self.config._settings.allow_duplicate_ips).lower() in [ "1", "y", "yes"]: matched = self.config.api.find_items("system", {"ip_address" : address}) for x in matched: if x.name != self.name: @@ -300,7 +300,7 @@ class System(item.Item): # FIXME: move duplicate supression code to the object validation # functions to take a harder line on supression? - if not str(self.config._settings.allow_duplicate_macs).lower() in [ "1", "y", "yes"]: + if address != "" and not str(self.config._settings.allow_duplicate_macs).lower() in [ "1", "y", "yes"]: matched = self.config.api.find_items("system", {"mac_address" : address}) for x in matched: if x.name != self.name: |