diff options
| -rw-r--r-- | cobbler.spec | 2 | ||||
| -rw-r--r-- | cobbler/item.py | 2 | ||||
| -rw-r--r-- | cobbler/item_system.py | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/cobbler.spec b/cobbler.spec index a84d634..f40af0a 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -3,7 +3,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no Version: 0.8.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System diff --git a/cobbler/item.py b/cobbler/item.py index 78c8041..fd79012 100644 --- a/cobbler/item.py +++ b/cobbler/item.py @@ -117,7 +117,7 @@ class Item(serializable.Serializable): if type(name) != type(""): raise CX(_("name must be a string")) for x in name: - if not x.isalnum() and not x in [ "-", ".", ":", "+" ] : + if not x.isalnum() and not x in [ "_", "-", ".", ":", "+" ] : raise CX(_("invalid characters in name")) self.name = name return True diff --git a/cobbler/item_system.py b/cobbler/item_system.py index f5b16ca..dadd8d1 100644 --- a/cobbler/item_system.py +++ b/cobbler/item_system.py @@ -153,7 +153,7 @@ class System(item.Item): if type(name) != type(""): raise CX(_("name must be a string")) for x in name: - if not x.isalnum() and not x in [ "-", ".", ":", "+" ] : + if not x.isalnum() and not x in [ "_", "-", ".", ":", "+" ] : raise CX(_("invalid characters in name")) if utils.is_mac(name): diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 56b93f6..7ef1b0a 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__ = 1207678316.193969 -__CHEETAH_genTimestamp__ = 'Tue Apr 8 14:11:56 2008' +__CHEETAH_genTime__ = 1207686338.5978019 +__CHEETAH_genTimestamp__ = 'Tue Apr 8 16:25:38 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' |