summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/Client/Tools/__init__.py2
-rw-r--r--src/lib/Server/Plugins/Cfg.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/__init__.py b/src/lib/Client/Tools/__init__.py
index 90d3cedbc..24a629f99 100644
--- a/src/lib/Client/Tools/__init__.py
+++ b/src/lib/Client/Tools/__init__.py
@@ -2,7 +2,7 @@
__revision__ = '$Revision$'
__all__ = ["Action", "APT", "Blast", "Chkconfig", "DebInit", "Encap", "launchd",
- "Portage", "POSIX", "RPM", "RcUpdate", "SMF", "SYSV", "Yum"]
+ "Portage", "POSIX", "RPM", "RcUpdate", "SMF", "SYSV"]
import os, popen2, stat, sys, Bcfg2.Client.XML
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py
index 03b521abe..9169e2409 100644
--- a/src/lib/Server/Plugins/Cfg.py
+++ b/src/lib/Server/Plugins/Cfg.py
@@ -114,10 +114,11 @@ class ConfigFileEntry(object):
'''add new file additions for a single cf file'''
basename = name.split('/')[-1]
rbasename = self.repopath.split('/')[-1]
- if not ((basename == ':info') or (basename[:len(rbasename)] == rbasename)):
+ if not ((basename not in [':info', 'info']) or
+ (basename[:len(rbasename)] == rbasename)):
logger.error("Confused about file %s; ignoring" % (name))
return
- if basename == ':info':
+ if basename in [':info', 'info']:
return self.read_info(basename)
try: