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 /cobbler | |
| 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.
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_check.py | 1 | ||||
| -rw-r--r-- | cobbler/modules/serializer_yaml.py | 5 |
2 files changed, 4 insertions, 2 deletions
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) |