From 5e494a8be31724d0b2f990f60337c83e545d4c1e Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 9 Mar 2006 20:23:35 +0000 Subject: * 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 --- src/lib/Server/Plugins/Cfg.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/lib/Server/Plugins') 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: -- cgit v1.2.3-1-g7c22