summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Lint
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-20 10:38:57 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-20 10:38:57 -0500
commit4b339bf61244714661fc73a192296ca37b12ab9f (patch)
tree6d96fc0d8a2b3f3b5e6fab10c27af0130243a573 /src/lib/Bcfg2/Server/Lint
parent69ebf49d54aac70a42142d0d04e562496bce58ea (diff)
downloadbcfg2-4b339bf61244714661fc73a192296ca37b12ab9f.tar.gz
bcfg2-4b339bf61244714661fc73a192296ca37b12ab9f.tar.bz2
bcfg2-4b339bf61244714661fc73a192296ca37b12ab9f.zip
fixed unit tests for merge
Diffstat (limited to 'src/lib/Bcfg2/Server/Lint')
-rwxr-xr-xsrc/lib/Bcfg2/Server/Lint/Genshi.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/Genshi.py b/src/lib/Bcfg2/Server/Lint/Genshi.py
index ed0d9930f..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
@@ -43,7 +42,7 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
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: