summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-06-11 01:21:07 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-06-11 01:21:07 +0000
commit5cb1c27d9a4082572cd80c9600f3d6fbae122ad0 (patch)
tree63ca209296bcbfdd6a48125fdb38c0aaa03d8c88 /src/lib
parentc02d3575ab0241209e67c7052dcd3767173860db (diff)
downloadbcfg2-5cb1c27d9a4082572cd80c9600f3d6fbae122ad0.tar.gz
bcfg2-5cb1c27d9a4082572cd80c9600f3d6fbae122ad0.tar.bz2
bcfg2-5cb1c27d9a4082572cd80c9600f3d6fbae122ad0.zip
Improve bundler error handling for .genshi files
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5272 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Server/Plugins/Bundler.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Bundler.py b/src/lib/Server/Plugins/Bundler.py
index e0e2ad7f0..ee7edb49c 100644
--- a/src/lib/Server/Plugins/Bundler.py
+++ b/src/lib/Server/Plugins/Bundler.py
@@ -5,7 +5,7 @@ import copy, lxml.etree, Bcfg2.Server.Plugin, re
try:
import Bcfg2.Server.Plugins.SGenshi
- import genshi.template
+ import genshi.template, genshi.template.base
have_genshi = True
except:
have_genshi = False
@@ -58,7 +58,7 @@ class Bundler(Bcfg2.Server.Plugin.Plugin,
elif len(entries) == 1:
try:
bundleset.append(entries[0].get_xml_value(metadata))
- except genshi.template.TemplateError, t:
+ except genshi.template.base.TemplateError, t:
self.logger.error("Bundler: Failed to template genshi bundle %s" \
% (bundlename))
self.logger.error(t)