From bf24d9ca6dbbc2e27a92d25562e7129c1c1e708c Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 21 May 2012 11:38:19 -0500 Subject: Bundler: Fix genshi import Wasn't properly importing genshi previously. >>> import genshi.template.base.TemplateError Traceback (most recent call last): File "", line 1, in ImportError: No module named TemplateError >>> import genshi.template.base >>> genshi.template.base.TemplateError Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Plugins/Bundler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Bundler.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index 1d1171782..cbaa85089 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -10,7 +10,7 @@ import Bcfg2.Server import Bcfg2.Server.Plugin try: - import genshi.template.base.TemplateError + import genshi.template.base from Bcfg2.Server.Plugins.SGenshi import SGenshiTemplateFile have_genshi = True except: @@ -82,7 +82,7 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, continue try: bundleset.append(entries[0].get_xml_value(metadata)) - except TemplateError: + except genshi.template.base.TemplateError: t = sys.exc_info()[1] self.logger.error("Bundler: Failed to template genshi bundle %s" % bundlename) -- cgit v1.2.3-1-g7c22