diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-10-05 08:13:49 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-10-05 08:13:49 -0400 |
| commit | 4ab7706aca76118de9b3c1cabdc395b82b1acf58 (patch) | |
| tree | be137fe310da8a5365eab9d499d6f69651d4b0bf /src | |
| parent | 71102f13e9295367a5c2ab2f76fce0c6c4940976 (diff) | |
| download | bcfg2-4ab7706aca76118de9b3c1cabdc395b82b1acf58.tar.gz bcfg2-4ab7706aca76118de9b3c1cabdc395b82b1acf58.tar.bz2 bcfg2-4ab7706aca76118de9b3c1cabdc395b82b1acf58.zip | |
make Bundler skip unknown filenames; this prevents an occasional stack trace when the Svn2.Update procedure is called
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Bundler.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Bundler.py b/src/lib/Server/Plugins/Bundler.py index bf0c42416..ec73d5022 100644 --- a/src/lib/Server/Plugins/Bundler.py +++ b/src/lib/Server/Plugins/Bundler.py @@ -52,8 +52,13 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, raise Bcfg2.Server.Plugin.PluginInitError def template_dispatch(self, name): - bundle = lxml.etree.parse(name) - nsmap = bundle.getroot().nsmap + if name.endswith('.xml') or name.endswith('.genshi'): + bundle = lxml.etree.parse(name) + nsmap = bundle.getroot().nsmap + else: + self.logger.warning("Skipping unknown file %s" % name) + return + if name.endswith('.xml'): if have_genshi and \ (nsmap == {'py': 'http://genshi.edgewall.org/'}): |