From 4ab7706aca76118de9b3c1cabdc395b82b1acf58 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 5 Oct 2011 08:13:49 -0400 Subject: make Bundler skip unknown filenames; this prevents an occasional stack trace when the Svn2.Update procedure is called --- src/lib/Server/Plugins/Bundler.py | 9 +++++++-- 1 file 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/'}): -- cgit v1.2.3-1-g7c22