diff options
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | cobbler.spec | 7 | ||||
| -rw-r--r-- | cobbler/utils.py | 3 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 14 insertions, 3 deletions
@@ -1,6 +1,11 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) +* Thu Nov 15 2007 - 0.7.0 +- Testing branch +- Fix bug related to <<inherit>> and kickstart args +- ... + * Wed Nov 14 2007 - 0.6.4 - Changed permissions of auth.conf - Fixes for working with rhn_yum_plugin diff --git a/cobbler.spec b/cobbler.spec index 3de7850..e7b0599 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: Boot server configurator Name: cobbler -Version: 0.6.4 -Release: 2%{?dist} +Version: 0.7.0 +Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -192,6 +192,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 15 2007 Michael DeHaan <mdehaan@redhat.com> - 0.7.0-1 +- Upstream changes (see CHANGELOG), testing branch + * Wed Nov 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.4-2 - Upstream changes (see CHANGELOG) - Permissions changes diff --git a/cobbler/utils.py b/cobbler/utils.py index db55128..13503e5 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -237,6 +237,9 @@ def input_string_or_hash(options,delim=","): Newer versions of cobbler allow dictionaries. This function is used to allow loading of older value formats so new users of cobbler aren't broken in an upgrade. """ + if options == "<<inherit>>": + options = {} + if options is None: return (True, {}) elif type(options) == list: @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "0.6.4" +VERSION = "0.7.0" SHORT_DESC = "Network Boot and Update Server" LONG_DESC = """ Cobbler is a network boot and update server. Cobbler supports PXE, provisioning virtualized images, and reinstalling existing Linux machines. The last two modes require a helper tool called 'koan' that integrates with cobbler. Cobbler's advanced features include importing distributions from DVDs and rsync mirrors, kickstart templating, integrated yum mirroring, and built-in DHCP Management. Cobbler has a Python API for integration with other GPL systems management applications. |