diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-09-15 11:51:56 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-09-15 11:51:56 -0400 |
| commit | 2f3e25ebc628a6a1c07c652143290e7606fc8d02 (patch) | |
| tree | feb369722fb93ce4c0df4cfc606e92d4546679ca /src | |
| parent | 88d41171dc7c80a7be92689a59347c0f984562dc (diff) | |
| download | bcfg2-2f3e25ebc628a6a1c07c652143290e7606fc8d02.tar.gz bcfg2-2f3e25ebc628a6a1c07c652143290e7606fc8d02.tar.bz2 bcfg2-2f3e25ebc628a6a1c07c652143290e7606fc8d02.zip | |
fixed bugs introduced by <Group>/<Client> tags in templated bundles
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Lint/Bundles.py | 6 | ||||
| -rw-r--r-- | src/lib/Server/Lint/Comments.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Lint/RequiredAttrs.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/Server/Lint/Bundles.py b/src/lib/Server/Lint/Bundles.py index 67ae14fbd..472915cfd 100644 --- a/src/lib/Server/Lint/Bundles.py +++ b/src/lib/Server/Lint/Bundles.py @@ -10,11 +10,9 @@ class Bundles(Bcfg2.Server.Lint.ServerPlugin): self.missing_bundles() for bundle in self.core.plugins['Bundler'].entries.values(): if self.HandlesFile(bundle.name): - if (Bcfg2.Server.Plugins.Bundler.have_genshi and - type(bundle) is + if (not Bcfg2.Server.Plugins.Bundler.have_genshi or + type(bundle) is not Bcfg2.Server.Plugins.SGenshi.SGenshiTemplateFile): - self.sgenshi_groups(bundle) - else: self.bundle_names(bundle) def missing_bundles(self): diff --git a/src/lib/Server/Lint/Comments.py b/src/lib/Server/Lint/Comments.py index 1ea5f295e..19fae1b08 100644 --- a/src/lib/Server/Lint/Comments.py +++ b/src/lib/Server/Lint/Comments.py @@ -57,7 +57,7 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): try: xdata = lxml.etree.XML(bundle.data) rtype = "bundler" - except AttributeError: + except (lxml.etree.XMLSyntaxError, AttributeError): xdata = lxml.etree.parse(bundle.template.filepath).getroot() rtype = "sgenshi" diff --git a/src/lib/Server/Lint/RequiredAttrs.py b/src/lib/Server/Lint/RequiredAttrs.py index 9f00a4e24..a94bbb3ed 100644 --- a/src/lib/Server/Lint/RequiredAttrs.py +++ b/src/lib/Server/Lint/RequiredAttrs.py @@ -67,7 +67,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): for bundle in self.core.plugins['Bundler'].entries.values(): try: xdata = lxml.etree.XML(bundle.data) - except AttributeError: + except (lxml.etree.XMLSyntaxError, AttributeError): xdata = lxml.etree.parse(bundle.template.filepath).getroot() for path in xdata.xpath("//BoundPath"): |