Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 1 insertions, 18 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py
index c045c2ca2..caee238bc 100755
--- 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
 
 
@@ -15,8 +14,6 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
         """ run plugin """
         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()
 
@@ -39,27 +36,13 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
                         self.LintError("genshi-syntax-error",
                                        "Genshi syntax error: %s" % 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)
-
     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)):
+                entry.template is not None):
                 try:
                     loader.load(entry.name, cls=MarkupTemplate)
                 except TemplateSyntaxError: