diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-03 15:28:33 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-03 15:28:33 -0400 |
| commit | 5b6e588af64e89eeafbe54df137416a9be102482 (patch) | |
| tree | 821177d8beba1820c9e2a727121f43fed66db770 /src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py | |
| parent | df04a2cb820c3d161d207352e1745b04944026b3 (diff) | |
| download | bcfg2-5b6e588af64e89eeafbe54df137416a9be102482.tar.gz bcfg2-5b6e588af64e89eeafbe54df137416a9be102482.tar.bz2 bcfg2-5b6e588af64e89eeafbe54df137416a9be102482.zip | |
Cfg: fixed some issues with genshi error handling
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py | 4 |
1 files changed, 2 insertions, 2 deletions
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: |