From 97ee4fddbfcfefa7005e66736c0fbb9dc676ecbe Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Sat, 24 May 2008 00:57:07 +0000 Subject: handle genshi parse errors better git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4632 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/TGenshi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/Server/Plugins/TGenshi.py b/src/lib/Server/Plugins/TGenshi.py index 0b9acfe58..c1dc25dfb 100644 --- a/src/lib/Server/Plugins/TGenshi.py +++ b/src/lib/Server/Plugins/TGenshi.py @@ -4,7 +4,7 @@ __revision__ = '$Revision$' from genshi.template import TemplateLoader, TextTemplate, MarkupTemplate, TemplateError import logging import Bcfg2.Server.Plugin -import genshi.core +import genshi.core, genshi.input logger = logging.getLogger('Bcfg2.Plugins.TGenshi') @@ -41,6 +41,8 @@ class TemplateFile: self.template = loader.load(self.name, cls=self.template_cls) except TemplateError, terror: logger.error('Genshi template error: %s' % terror) + except genshi.input.ParseError, perror: + logger.error('Genshi parse error: %s' % perror) def bind_entry(self, entry, metadata): '''Build literal file information''' -- cgit v1.2.3-1-g7c22