From 3d054585fab3919a7f61ac7776e3b3d0cf5fc71a Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Sun, 4 May 2008 20:48:00 +0000 Subject: SGenshi: Fix error handling in case of template errors git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4591 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/SGenshi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/Server/Plugins/SGenshi.py') diff --git a/src/lib/Server/Plugins/SGenshi.py b/src/lib/Server/Plugins/SGenshi.py index fb3e3f6f4..10559733c 100644 --- a/src/lib/Server/Plugins/SGenshi.py +++ b/src/lib/Server/Plugins/SGenshi.py @@ -3,6 +3,7 @@ __revision__ = '$Revision$' import Bcfg2.Server.Plugin, Bcfg2.Server.Plugins.TGenshi import lxml.etree, logging +import genshi.template logger = logging.getLogger('Bcfg2.Plugins.SGenshi') @@ -38,7 +39,8 @@ class SGenshiEntrySet(Bcfg2.Server.Plugin.EntrySet): for entry in self.get_matching(metadata): try: ret.append(entry.get_xml_value(metadata)) - except Bcfg2.Server.Plugin.PluginExecutionError: + except genshi.template.TemplateError, terror: + logger.error('Genshi template error: %s' % terror) logger.error("SGenshi: Failed to template file %s" % entry.name) return ret -- cgit v1.2.3-1-g7c22