diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-05-16 16:26:52 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-05-16 16:26:52 -0400 |
| commit | 6f5ad0b0fe3d43f5cf5efaa465f8eff4c92eb642 (patch) | |
| tree | 268381756114f57f613388d4bcccab0f369fb40e | |
| parent | 90666a4a0a3c918a31f7cdfd9fa9fd2a6ad48705 (diff) | |
| download | third_party-cobbler-6f5ad0b0fe3d43f5cf5efaa465f8eff4c92eb642.tar.gz third_party-cobbler-6f5ad0b0fe3d43f5cf5efaa465f8eff4c92eb642.tar.xz third_party-cobbler-6f5ad0b0fe3d43f5cf5efaa465f8eff4c92eb642.zip | |
Fix to make serializer look in the right place, also removed a debug
print.
| -rw-r--r-- | cobbler.spec | 4 | ||||
| -rw-r--r-- | cobbler/action_check.py | 1 | ||||
| -rw-r--r-- | cobbler/modules/serializer_yaml.py | 5 | ||||
| -rw-r--r-- | website/codepush.sh | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cobbler.spec b/cobbler.spec index c4284f3..523485c 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -3,7 +3,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -188,7 +188,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -* Fri May 16 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.2-1 +* Fri May 16 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.2-2 - Upstream changes (see CHANGELOG) - moved /var/lib/cobbler/settings to /etc/cobbler/settings diff --git a/cobbler/action_check.py b/cobbler/action_check.py index d38603b..74af0c6 100644 --- a/cobbler/action_check.py +++ b/cobbler/action_check.py @@ -156,7 +156,6 @@ class BootCheck: for r in self.config.repos(): if r.mirror_locally == 1: lookfor = os.path.join(self.settings.webdir, "repo_mirror", r.name) - print "DEBUG: looking for: %s" % lookfor if not os.path.exists(lookfor): need_sync.append(r.name) if len(need_sync) > 0: diff --git a/cobbler/modules/serializer_yaml.py b/cobbler/modules/serializer_yaml.py index 724265d..c4bd359 100644 --- a/cobbler/modules/serializer_yaml.py +++ b/cobbler/modules/serializer_yaml.py @@ -66,7 +66,10 @@ def get_filename(collection_type): ending = collection_type if not ending.endswith("s"): ending = ending + "s" - return "/var/lib/cobbler/%s" % ending + if ending != "settings": + return "/var/lib/cobbler/%s" % ending + else: + return "/etc/cobbler/settings" def deserialize_raw(collection_type): filename = get_filename(collection_type) diff --git a/website/codepush.sh b/website/codepush.sh deleted file mode 100644 index e997938..0000000 --- a/website/codepush.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -scp ../rpm-build/*.src.rpm et.redhat.com:/var/www/sites/cobbler.et.redhat.com/download -scp ../rpm-build/*.tar.gz et.redhat.com:/var/www/sites/cobbler.et.redhat.com/download |