From 5b6e588af64e89eeafbe54df137416a9be102482 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 3 Oct 2012 15:28:33 -0400 Subject: Cfg: fixed some issues with genshi error handling --- src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py index 2f59d74f2..5cec33489 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py @@ -108,11 +108,11 @@ class CfgGenshiGenerator(CfgGenerator): # a failure in a %{ python ... %} block -- the snippet in # the traceback is just the beginning of the block. - err = [1] + err = exc[1] stack = traceback.extract_tb(exc[2]) lineno, func = stack[-1][1:3] execs = [contents - for etype, contents in self.template.stream[:2] + for etype, contents, _ in self.template.stream if etype == self.template.EXEC] contents = None if len(execs) == 1: -- cgit v1.2.3-1-g7c22