diff options
| -rw-r--r-- | cobbler.spec | 4 | ||||
| -rw-r--r-- | cobbler/item.py | 5 | ||||
| -rw-r--r-- | cobbler/item_repo.py | 8 | ||||
| -rw-r--r-- | cobbler/item_system.py | 9 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 |
5 files changed, 18 insertions, 12 deletions
diff --git a/cobbler.spec b/cobbler.spec index 9e64040..070bff3 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -191,11 +191,15 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +<<<<<<< HEAD:cobbler.spec * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 +======= +* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-2 +>>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1 diff --git a/cobbler/item.py b/cobbler/item.py index dddbaaa..454b704 100644 --- a/cobbler/item.py +++ b/cobbler/item.py @@ -115,8 +115,9 @@ class Item(serializable.Serializable): raise CX(_("self parentage is weird")) if type(name) != type(""): raise CX(_("name must be a string")) - if not name.isalnum(): - raise CX(_("name must be alphanumeric")) + for x in name: + if not x.isalnum() and not x in [ "-", ".", ":", "+" ] : + raise CX(_("invalid characters in name")) self.name = name return True diff --git a/cobbler/item_repo.py b/cobbler/item_repo.py index 9063c5b..1ebea30 100644 --- a/cobbler/item_repo.py +++ b/cobbler/item_repo.py @@ -60,14 +60,6 @@ class Repo(item.Item): return self - def set_name(self,name): - """ - A name can be anything. It's a string, though best values are something like "fc6extras" - or "myrhel4stuff" - """ - self.name = name # we check it add time, but store the original value. - return True - def set_mirror(self,mirror): """ A repo is (initially, as in right now) is something that can be rsynced. diff --git a/cobbler/item_system.py b/cobbler/item_system.py index d09d579..dd7bd64 100644 --- a/cobbler/item_system.py +++ b/cobbler/item_system.py @@ -150,6 +150,15 @@ class System(item.Item): """ intf = self.__get_interface("intf0") + + if self.name not in ["",None] and self.parent not in ["",None] and self.name == self.parent: + raise CX(_("self parentage is weird")) + if type(name) != type(""): + raise CX(_("name must be a string")) + for x in name: + if not x.isalnum() and not x in [ "-", ".", ":", "+" ] : + raise CX(_("invalid characters in name")) + if utils.is_mac(name): if intf["mac_address"] == "": intf["mac_address"] = name diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index d2d1acf..0a6e9dd 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0.1' __CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1207674554.5409529 -__CHEETAH_genTimestamp__ = 'Tue Apr 8 13:09:14 2008' +__CHEETAH_genTime__ = 1207681739.292002 +__CHEETAH_genTimestamp__ = 'Tue Apr 8 15:08:59 2008' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Fri Feb 15 14:47:43 2008' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' |