diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-03-09 20:23:35 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-03-09 20:23:35 +0000 |
| commit | 5e494a8be31724d0b2f990f60337c83e545d4c1e (patch) | |
| tree | 89aa1e4b25395b776a41a77d2c33f91fc5e925cc /src/lib/Server/Plugins/Cfg.py | |
| parent | 40c0c342fcdd1cea0b9b8972ea539d7368b85f82 (diff) | |
| download | bcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.tar.gz bcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.tar.bz2 bcfg2-5e494a8be31724d0b2f990f60337c83e545d4c1e.zip | |
* Remove messages describing extra configuration elements when running in bundle mode
* Handle garbage filenames in Cfg more gracefully
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1799 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/Cfg.py')
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 157243e50..73e078748 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -105,7 +105,12 @@ class ConfigFileEntry(object): def AddEntry(self, name): '''add new file additions for a single cf file''' - if name[-5:] == ':info': + basename = name.split('/')[-1] + rbasename = self.repopath.split('/')[-1] + if not ((basename == ':info') or (basename[:len(rbasename)] == rbasename)): + logger.error("Confused about file %s; ignoring" % (name)) + return + if basename == ':info': return self.read_info() try: |