From ee1f789a1c9977bed2b9eff85a748db3273a9e9b Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 29 Aug 2012 08:47:27 -0400 Subject: Cfg: clarified genshi errors --- src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/lib/Bcfg2/Server') diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py index 277a26f97..7e2f83962 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py @@ -62,8 +62,8 @@ class CfgGenshiGenerator(CfgGenerator): stack = traceback.extract_tb(sys.exc_info()[2]) for quad in stack: if quad[0] == self.name: - logger.error("Cfg: Error rendering %s at %s: %s" % - (fname, quad[2], err)) + logger.error("Cfg: Error rendering %s at '%s': %s: %s" % + (fname, quad[2], err.__class__.__name__, err)) break raise except: @@ -105,8 +105,9 @@ class CfgGenshiGenerator(CfgGenerator): # single line break) real_lineno = lineno - contents.code.co_firstlineno src = re.sub(r'\n\n+', '\n', contents.source).splitlines() - logger.error("Cfg: Error rendering %s at %s: %s" % - (fname, src[real_lineno], err)) + logger.error("Cfg: Error rendering %s at '%s': %s: %s" % + (fname, src[real_lineno], err.__class__.__name__, + err)) raise def handle_event(self, event): -- cgit v1.2.3-1-g7c22