summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-06-03 09:43:56 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-06-03 09:45:32 -0400
commit8682a0642ce953077779370307e9dc3d6aec64ff (patch)
tree18f2175ab7f93e23c1e22c0c78604c868622fce3
parent521862b6584eb4d68e12df5d1a5c4f7a8ef1bdf5 (diff)
downloadbcfg2-8682a0642ce953077779370307e9dc3d6aec64ff.tar.gz
bcfg2-8682a0642ce953077779370307e9dc3d6aec64ff.tar.bz2
bcfg2-8682a0642ce953077779370307e9dc3d6aec64ff.zip
lint: catch unexpected Genshi errors
-rwxr-xr-xsrc/lib/Bcfg2/Server/Lint/Genshi.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py
index 7edeb8a49..1ecb6da42 100755
--- a/src/lib/Bcfg2/Server/Lint/Genshi.py
+++ b/src/lib/Bcfg2/Server/Lint/Genshi.py
@@ -37,6 +37,12 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
err = sys.exc_info()[1]
self.LintError("genshi-syntax-error",
"Genshi syntax error: %s" % err)
+ except:
+ etype, err = sys.exc_info()[:2]
+ self.LintError(
+ "genshi-syntax-error",
+ "Unexpected Genshi error on %s: %s: %s" %
+ (entry.name, etype.__name__, err))
def check_tgenshi(self):
""" Check templates in TGenshi for syntax errors. """