1 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/TemplateAbuse.py b/src/lib/Bcfg2/Server/Lint/TemplateAbuse.py
index fca9d14a9..a437c1318 100644
--- a/src/lib/Bcfg2/Server/Lint/TemplateAbuse.py
+++ b/src/lib/Bcfg2/Server/Lint/TemplateAbuse.py
@@ -4,20 +4,24 @@ import os
 import stat
 import Bcfg2.Server.Lint
 from Bcfg2.Compat import any  # pylint: disable=W0622
-from Bcfg2.Server.Plugin import DEFAULT_FILE_METADATA
+from Bcfg2.Server.Plugin import default_path_metadata
 from Bcfg2.Server.Plugins.Cfg.CfgInfoXML import CfgInfoXML
 from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import CfgGenshiGenerator
 from Bcfg2.Server.Plugins.Cfg.CfgCheetahGenerator import CfgCheetahGenerator
+from Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator import CfgJinja2Generator
 from Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenshiGenerator import \
     CfgEncryptedGenshiGenerator
 from Bcfg2.Server.Plugins.Cfg.CfgEncryptedCheetahGenerator import \
     CfgEncryptedCheetahGenerator
+from Bcfg2.Server.Plugins.Cfg.CfgEncryptedJinja2Generator import \
+    CfgEncryptedJinja2Generator
 
 
 class TemplateAbuse(Bcfg2.Server.Lint.ServerPlugin):
     """ Check for templated scripts or executables. """
-    templates = [CfgGenshiGenerator, CfgCheetahGenerator,
-                 CfgEncryptedGenshiGenerator, CfgEncryptedCheetahGenerator]
+    templates = [CfgGenshiGenerator, CfgCheetahGenerator, CfgJinja2Generator,
+                 CfgEncryptedGenshiGenerator, CfgEncryptedCheetahGenerator,
+                 CfgEncryptedJinja2Generator]
     extensions = [".pl", ".py", ".sh", ".rb"]
 
     def Run(self):
@@ -58,10 +62,11 @@ class TemplateAbuse(Bcfg2.Server.Lint.ServerPlugin):
         # finally, check for executable permissions in info.xml
         for entry in entryset.entries.values():
             if isinstance(entry, CfgInfoXML):
-                for pinfo in entry.infoxml.pnode.data.xpath("//FileInfo"):
+                for pinfo in entry.infoxml.xdata.xpath("//FileInfo/Info"):
                     try:
-                        mode = int(pinfo.get("mode",
-                                             DEFAULT_FILE_METADATA['mode']), 8)
+                        mode = int(
+                            pinfo.get("mode",
+                                      default_path_metadata()['mode']), 8)
                     except ValueError:
                         # LintError will be produced by RequiredAttrs plugin
                         self.logger.warning("Non-octal mode: %s" % mode)