diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-04-08 13:09:36 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-04-08 13:09:36 -0400 |
| commit | 9e0727785a0851ccdff880aa19bb8f21c4aa2840 (patch) | |
| tree | a58c0f76e18b5c87734173fd59bf8b6ca625daa6 /cobbler | |
| parent | f3a7e9f8a2b85fb936d98aa118bec5189b26140f (diff) | |
| parent | a124e7449fbc724637e45457905737883175d15f (diff) | |
| download | third_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.tar.gz third_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.tar.xz third_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.zip | |
Merge branch 'master' into devel
Conflicts:
CHANGELOG
cobbler.spec
cobbler/webui/master.py
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/item.py | 4 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cobbler/item.py b/cobbler/item.py index 027472a..dddbaaa 100644 --- a/cobbler/item.py +++ b/cobbler/item.py @@ -113,6 +113,10 @@ class Item(serializable.Serializable): """ 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")) + if not name.isalnum(): + raise CX(_("name must be alphanumeric")) self.name = name return True diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 157b156..d2d1acf 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__ = 1206550188.6649311 -__CHEETAH_genTimestamp__ = 'Wed Mar 26 12:49:48 2008' +__CHEETAH_genTime__ = 1207674554.5409529 +__CHEETAH_genTimestamp__ = 'Tue Apr 8 13:09:14 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' |