diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-25 10:45:41 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-04-25 10:45:41 -0400 |
commit | 17b8ceb17e0ee775a667d2f92b2b192e567b2df6 (patch) | |
tree | 103ade296f16fa1457abcb7f97fd5d158b435385 /src/lib/Server/Lint/RequiredAttrs.py | |
parent | 66642f84fd71e9230245b11718bf9a7e96ba0c7f (diff) | |
download | bcfg2-17b8ceb17e0ee775a667d2f92b2b192e567b2df6.tar.gz bcfg2-17b8ceb17e0ee775a667d2f92b2b192e567b2df6.tar.bz2 bcfg2-17b8ceb17e0ee775a667d2f92b2b192e567b2df6.zip |
Various bcfg2-lint fixes:
* check for all plugins before referencing them, since in --stdin mode
even plugins like Bundler may not be instantiated
* formatting fixes
* made Bundles plugin work with or without genshi installed
* fixed name of plugin in example bcfg2-lint.conf
Diffstat (limited to 'src/lib/Server/Lint/RequiredAttrs.py')
-rw-r--r-- | src/lib/Server/Lint/RequiredAttrs.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/Server/Lint/RequiredAttrs.py b/src/lib/Server/Lint/RequiredAttrs.py index 7215fe163..70ce4fe0a 100644 --- a/src/lib/Server/Lint/RequiredAttrs.py +++ b/src/lib/Server/Lint/RequiredAttrs.py @@ -34,14 +34,15 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): def check_bundles(self): """ check bundles for BoundPath entries with missing attrs """ - for bundle in self.core.plugins['Bundler'].entries.values(): - try: - xdata = lxml.etree.XML(bundle.data) - except AttributeError: - xdata = lxml.etree.parse(bundle.template.filepath).getroot() + if 'Bundler' in self.core.plugins: + for bundle in self.core.plugins['Bundler'].entries.values(): + try: + xdata = lxml.etree.XML(bundle.data) + except AttributeError: + xdata = lxml.etree.parse(bundle.template.filepath).getroot() - for path in xdata.xpath("//BoundPath"): - self.check_entry(path, bundle.name) + for path in xdata.xpath("//BoundPath"): + self.check_entry(path, bundle.name) def check_entry(self, entry, filename): """ generic entry check """ |