1 files changed, 31 insertions, 17 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py
index 437e69d82..ed0d9930f 100755
--- a/src/lib/Bcfg2/Server/Lint/Genshi.py
+++ b/src/lib/Bcfg2/Server/Lint/Genshi.py
@@ -1,8 +1,11 @@
 """ Check Genshi templates for syntax errors """
 
 import sys
-import genshi.template
 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
 
 
 class Genshi(Bcfg2.Server.Lint.ServerPlugin):
@@ -10,29 +13,40 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
 
     def Run(self):
         """ run plugin """
-        loader = genshi.template.TemplateLoader()
         if 'Cfg' in self.core.plugins:
-            self.check_files(self.core.plugins['Cfg'].entries,
-                             loader=loader)
+            self.check_cfg()
+        if 'Bundler' in self.core.plugins:
+            self.check_bundler()
 
     @classmethod
     def Errors(cls):
         return {"genshi-syntax-error": "error"}
 
-    def check_files(self, entries, loader=None):
-        """ Check genshi templates in a list of entries for syntax
-        errors """
-        if loader is None:
-            loader = genshi.template.TemplateLoader()
-
-        for eset in entries.values():
-            for fname, sdata in list(eset.entries.items()):
-                if (self.HandlesFile(fname) and
-                    (fname.endswith(".genshi") or fname.endswith(".newtxt"))):
+    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:
-                        loader.load(sdata.name,
-                                    cls=genshi.template.NewTextTemplate)
-                    except genshi.template.TemplateSyntaxError:
+                        entry.loader.load(entry.name,
+                                          cls=NewTextTemplate)
+                    except TemplateSyntaxError:
                         err = sys.exc_info()[1]
                         self.LintError("genshi-syntax-error",
                                        "Genshi syntax error: %s" % err)
+
+    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)