summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--cobbler/action_sync.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0529957..9e6857f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,13 +2,14 @@ Cobbler CHANGELOG
(all entries mdehaan@redhat.com unless noted otherwise)
* Fri Aug 17 2007 - 0.6.1
-- re enable --resolve in yumdownloader
+- re enable --resolve in yumdownloader (cobbler repo mgmt feature)
- fix get_distros_for_koan API function in cobblerd (not used by koan)
- allow find API to search by arbitrary fields
- status and logging now shows system names
- upgraded init scripts
- zeroconf/avahi publishing for cobblerd service
- logRequests = 0 for XMLRPC. Make it be quiet.
+- ignore subdirectories of /var/lib/cobbler/snippets
* Thu Aug 09 2007 - 0.6.0
- bugfix in error path in "cobbler check"
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index cd13cdf..c844610 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -470,6 +470,8 @@ class BootSync:
snippet_cache = {}
snippets = glob.glob("%s/*" % self.settings.snippetsdir)
for snip in snippets:
+ if os.path.isdir(snip):
+ continue
snip_file = open(snip)
data = snip_file.read()
snip_file.close()