added Genshi template syntax checker, other misc. bcfg2-lint cleanup

1 files changed, 27 insertions, 0 deletions

diff --git a/src/lib/Server/Lint/Genshi.py b/src/lib/Server/Lint/Genshi.py
new file mode 100755
index 000000000..552c495b2
--- /dev/null
+++ b/src/lib/Server/Lint/Genshi.py
@@ -0,0 +1,27 @@
+import genshi.template
+import Bcfg2.Server.Lint
+                        
+class Genshi(Bcfg2.Server.Lint.ServerPlugin):
+    """ Check Genshi templates for syntax errors """
+
+    def Run(self):
+        """ run plugin """
+        loader = genshi.template.TemplateLoader()
+        for plugin in ['Cfg', 'TGenshi']:
+            if plugin in self.core.plugins:
+                self.check_files(self.core.plugins[plugin].entries,
+                                 loader=loader)
+
+    def check_files(self, entries, loader=None):
+        if loader is None:
+            loader = genshi.template.TemplateLoader()
+            
+        for eset in entries.values():
+            for fname, sdata in list(eset.entries.items()):
+                if fname.endswith(".genshi") or fname.endswith(".newtxt"):
+                    try:
+                        loader.load(sdata.name,
+                                    cls=genshi.template.NewTextTemplate)
+                    except genshi.template.TemplateSyntaxError, err:
+                        self.LintError("genshi-syntax-error",
+                                       "Genshi syntax error: %s" % err)