summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-29 08:47:27 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-29 08:47:27 -0400
commitee1f789a1c9977bed2b9eff85a748db3273a9e9b (patch)
tree55f9e6f67a35f23810838ed0754489446d620e86 /src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py
parent0f31238e06b89c79f33b00d8c4ea81c8200bd076 (diff)
downloadbcfg2-ee1f789a1c9977bed2b9eff85a748db3273a9e9b.tar.gz
bcfg2-ee1f789a1c9977bed2b9eff85a748db3273a9e9b.tar.bz2
bcfg2-ee1f789a1c9977bed2b9eff85a748db3273a9e9b.zip
Cfg: clarified genshi errors
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py9
1 files changed, 5 insertions, 4 deletions
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):