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 | |
| 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
| -rw-r--r-- | CHANGELOG | 9 | ||||
| -rw-r--r-- | cobbler.spec | 4 | ||||
| -rw-r--r-- | cobbler/item.py | 4 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 |
4 files changed, 19 insertions, 2 deletions
@@ -1,7 +1,11 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) +<<<<<<< HEAD:CHANGELOG - Mon Mar 10 2008 - 0.9.0 +======= +* Tue Apr 08 2008 - 0.8.3 +>>>>>>> master:CHANGELOG - Make createrepo get run for local cobbler reposync invocations as needed - patch to allow yumopts to override gpgcheck - applied patch to send hostname from ISC @@ -19,7 +23,12 @@ Cobbler CHANGELOG - fix bug in /etc/cobbler/modules.conf regarding pluggable authn/z - fix default flags for yumdownloader - fix for RHEL 4u6 DVD/tree import x86_64 arch detection +<<<<<<< HEAD:CHANGELOG - fix for dnsmasq template file host config path +======= +- fix dnsmasq template to point at the correct hosts file +- force all names to be alphanumeric +>>>>>>> master:CHANGELOG * Fri Feb 22 2008 - 0.8.2 - fix to webui to allow repos to be edited there on profile page diff --git a/cobbler.spec b/cobbler.spec index c4cc5a0..b4e04bd 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 * Wed Mar 26 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf * Mon Mar 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 +======= +* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 +>>>>>>> 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 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' |