summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/Cfg.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-01-31 15:35:33 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-01-31 15:35:33 +0000
commit1d3719d6fbff53db8b797e29c5073921ad405667 (patch)
tree3a5917b7ea572a2d66cf865b44a211d38a6bfcf0 /src/lib/Server/Plugins/Cfg.py
parentc209b538261c843f62b15a05c5e879a9052d70a8 (diff)
downloadbcfg2-1d3719d6fbff53db8b797e29c5073921ad405667.tar.gz
bcfg2-1d3719d6fbff53db8b797e29c5073921ad405667.tar.bz2
bcfg2-1d3719d6fbff53db8b797e29c5073921ad405667.zip
* Disable Yum driver for now
* Add info files as an alternative for :info files (Resolves Ticket #382) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2735 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/Cfg.py')
-rw-r--r--src/lib/Server/Plugins/Cfg.py5
1 files changed, 3 insertions, 2 deletions
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: