diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-22 11:16:19 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-22 11:16:19 -0500 |
| commit | 22029e107420ff21cf9f1811bf4bb6dc2aba1dde (patch) | |
| tree | beec8e930b7204e64e01198e5d57b59f72ffef20 /src/lib/Bcfg2/Server/Lint/RequiredAttrs.py | |
| parent | 1b001ee4a4d5cacab04c1e99ad4cc4ce4ca93894 (diff) | |
| download | bcfg2-22029e107420ff21cf9f1811bf4bb6dc2aba1dde.tar.gz bcfg2-22029e107420ff21cf9f1811bf4bb6dc2aba1dde.tar.bz2 bcfg2-22029e107420ff21cf9f1811bf4bb6dc2aba1dde.zip | |
made genshi a requirement
Diffstat (limited to 'src/lib/Bcfg2/Server/Lint/RequiredAttrs.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/RequiredAttrs.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py index 61b737a82..bf72d26d0 100644 --- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py +++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py @@ -8,11 +8,7 @@ import Bcfg2.Server.Lint import Bcfg2.Client.Tools.POSIX import Bcfg2.Client.Tools.VCS from Bcfg2.Server.Plugins.Packages import Apt, Yum -try: - from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile - HAS_GENSHI = True -except ImportError: - HAS_GENSHI = False +from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile # format verifying functions @@ -183,8 +179,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): for bundle in self.core.plugins['Bundler'].entries.values(): if (self.HandlesFile(bundle.name) and - (not HAS_GENSHI or - not isinstance(bundle, BundleTemplateFile))): + not isinstance(bundle, BundleTemplateFile)): try: xdata = lxml.etree.XML(bundle.data) except (lxml.etree.XMLSyntaxError, AttributeError): |