1 files changed, 21 insertions, 41 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py
index 1ecb6da42..a2581e70b 100755..100644
--- a/src/lib/Bcfg2/Server/Lint/Genshi.py
+++ b/src/lib/Bcfg2/Server/Lint/Genshi.py
@@ -4,7 +4,6 @@ import sys
 import Bcfg2.Server.Lint
 from genshi.template import TemplateLoader, NewTextTemplate, MarkupTemplate, \
     TemplateSyntaxError
-from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile
 from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import CfgGenshiGenerator
 
 
@@ -14,60 +13,41 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
     def Run(self):
         if 'Cfg' in self.core.plugins:
             self.check_cfg()
-        if 'TGenshi' in self.core.plugins:
-            self.check_tgenshi()
         if 'Bundler' in self.core.plugins:
             self.check_bundler()
 
     @classmethod
     def Errors(cls):
-        return {"genshi-syntax-error": "error"}
+        return {"genshi-syntax-error": "error",
+                "unknown-genshi-error": "error"}
+
+    def check_template(self, loader, fname, cls=None):
+        """ Generic check for all genshi templates (XML and text) """
+        try:
+            loader.load(fname, cls=cls)
+        except TemplateSyntaxError:
+            err = sys.exc_info()[1]
+            self.LintError("genshi-syntax-error",
+                           "Genshi syntax error in %s: %s" % (fname, err))
+        except:
+            err = sys.exc_info()[1]
+            self.LintError("unknown-genshi-error",
+                           "Unknown Genshi error in %s: %s" % (fname, err))
 
     def check_cfg(self):
         """ Check genshi templates in Cfg for syntax errors. """
         for entryset in self.core.plugins['Cfg'].entries.values():
             for entry in entryset.entries.values():
                 if (self.HandlesFile(entry.name) and
-                    isinstance(entry, CfgGenshiGenerator) and
-                    not entry.template):
-                    try:
-                        entry.loader.load(entry.name,
-                                          cls=NewTextTemplate)
-                    except TemplateSyntaxError:
-                        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. """
-        loader = TemplateLoader()
-
-        for eset in self.core.plugins['TGenshi'].entries.values():
-            for fname, sdata in list(eset.entries.items()):
-                if self.HandlesFile(fname):
-                    try:
-                        loader.load(sdata.name, cls=NewTextTemplate)
-                    except TemplateSyntaxError:
-                        err = sys.exc_info()[1]
-                        self.LintError("genshi-syntax-error",
-                                       "Genshi syntax error: %s" % err)
+                        isinstance(entry, CfgGenshiGenerator) and
+                        not entry.template):
+                    self.check_template(entry.loader, entry.name,
+                                        cls=NewTextTemplate)
 
     def check_bundler(self):
         """ Check templates in Bundler for syntax errors. """
         loader = TemplateLoader()
-
         for entry in self.core.plugins['Bundler'].entries.values():
             if (self.HandlesFile(entry.name) and
-                isinstance(entry, BundleTemplateFile)):
-                try:
-                    loader.load(entry.name, cls=MarkupTemplate)
-                except TemplateSyntaxError:
-                    err = sys.exc_info()[1]
-                    self.LintError("genshi-syntax-error",
-                                   "Genshi syntax error: %s" % err)
+                    entry.template is not None):
+                self.check_template(loader, entry.name, cls=MarkupTemplate)