diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-15 14:53:18 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-15 14:56:58 -0400 |
| commit | a6b6871ecbc700229969f350b869bd19e785129d (patch) | |
| tree | f694f842f448d9faf6209c0b4bcbb4362f2d7130 /src/lib/Bcfg2/Server/Lint/RequiredAttrs.py | |
| parent | be1fd87aa8a3d2900483326b93f4a2800ec716fc (diff) | |
| download | bcfg2-a6b6871ecbc700229969f350b869bd19e785129d.tar.gz bcfg2-a6b6871ecbc700229969f350b869bd19e785129d.tar.bz2 bcfg2-a6b6871ecbc700229969f350b869bd19e785129d.zip | |
Removed deprecated plugins BB, Svcmgr, SGenshi
Diffstat (limited to 'src/lib/Bcfg2/Server/Lint/RequiredAttrs.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/RequiredAttrs.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py index b9a6dc2dc..fcb7c6c28 100644 --- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py +++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py @@ -5,9 +5,11 @@ import Bcfg2.Server.Lint import Bcfg2.Client.Tools.POSIX import Bcfg2.Client.Tools.VCS from Bcfg2.Server.Plugins.Packages import Apt, Yum -from Bcfg2.Server.Plugins.Bundler import have_genshi -if have_genshi: - from Bcfg2.Server.Plugins.SGenshi import SGenshiTemplateFile +try: + from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile + has_genshi = True +except ImportError: + has_genshi = False # format verifying functions def is_filename(val): @@ -157,8 +159,8 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): if 'Bundler' in self.core.plugins: for bundle in self.core.plugins['Bundler'].entries.values(): if (self.HandlesFile(bundle.name) and - (not have_genshi or - not isinstance(bundle, SGenshiTemplateFile))): + (not has_genshi or + not isinstance(bundle, BundleTemplateFile))): try: xdata = lxml.etree.XML(bundle.data) except (lxml.etree.XMLSyntaxError, AttributeError): |