diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-03-12 13:04:15 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-03-12 13:04:15 -0400 |
| commit | 2a6b394227c4044a1a1e950c16cd81b0299ccffe (patch) | |
| tree | e9e1eb560f18aecacf7bbebd78c0c2b4c17b35ba | |
| parent | 291f6c8af695f24d13e222fb0d35eeb659a66098 (diff) | |
| download | third_party-cobbler-2a6b394227c4044a1a1e950c16cd81b0299ccffe.tar.gz third_party-cobbler-2a6b394227c4044a1a1e950c16cd81b0299ccffe.tar.xz third_party-cobbler-2a6b394227c4044a1a1e950c16cd81b0299ccffe.zip | |
Fix bug in module loader to allow non-serializer modules to be loaded
using /etc/cobbler/modules.conf
| -rw-r--r-- | cobbler.spec | 5 | ||||
| -rw-r--r-- | cobbler/module_loader.py | 2 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 | ||||
| -rw-r--r-- | scripts/cobbler_auth_help | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/cobbler.spec b/cobbler.spec index e56d298..e34e0da 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.2 +Version: 0.8.3 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,6 +190,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 +- Upstream changes (see CHANGELOG) + * Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1 - Upstream changes (see CHANGELOG) diff --git a/cobbler/module_loader.py b/cobbler/module_loader.py index aafe05f..b695a04 100644 --- a/cobbler/module_loader.py +++ b/cobbler/module_loader.py @@ -76,7 +76,7 @@ def get_module_by_name(name): def get_module_from_file(category,field,fallback_module_name=None): try: - value = cp.get("serializers",field) + value = cp.get(category,field) except: if fallback_module_name is not None: value = fallback_module_name diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 48f3442..b2abf09 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__ = 1204907251.215054 -__CHEETAH_genTimestamp__ = 'Fri Mar 7 11:27:31 2008' +__CHEETAH_genTime__ = 1205174715.425076 +__CHEETAH_genTimestamp__ = 'Mon Mar 10 14:45:15 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' diff --git a/scripts/cobbler_auth_help b/scripts/cobbler_auth_help index 8842d59..198e95b 100644 --- a/scripts/cobbler_auth_help +++ b/scripts/cobbler_auth_help @@ -30,7 +30,7 @@ my $method; my $username; my $realm; my $password; -my $verbose=0; +my $verbose=1; my $result = GetOptions( "method=s" => \$method, @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "0.8.2" +VERSION = "0.8.3" 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. |