diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-07-11 15:34:51 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-07-11 15:34:51 -0400 |
commit | fd1ed3e79497c2968831f8e396236ac89bcf58fc (patch) | |
tree | 32b48746c63636131f486b6c94cdd42dd87043f6 /src/lib/Bcfg2/Server/Plugins | |
parent | e4c5c6aa3602335488936b6fd7c033245dd1ffb9 (diff) | |
download | bcfg2-fd1ed3e79497c2968831f8e396236ac89bcf58fc.tar.gz bcfg2-fd1ed3e79497c2968831f8e396236ac89bcf58fc.tar.bz2 bcfg2-fd1ed3e79497c2968831f8e396236ac89bcf58fc.zip |
bcfg2-lint bug fixes
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bundler.py | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index a7b5dccde..26fe1d822 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -92,6 +92,7 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, bundlename, exc_info=1) return bundleset + class BundlerLint(Bcfg2.Server.Lint.ServerPlugin): """ Perform various bundle checks """ def Run(self): @@ -99,7 +100,8 @@ class BundlerLint(Bcfg2.Server.Lint.ServerPlugin): self.missing_bundles() for bundle in self.core.plugins['Bundler'].entries.values(): if (self.HandlesFile(bundle.name) and - (not have_genshi or type(bundle) is not SGenshiTemplateFile)): + (not have_genshi or + not isinstance(bundle, SGenshiTemplateFile))): self.bundle_names(bundle) @classmethod diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 5293d7c94..081a68639 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -416,9 +416,12 @@ class Cfg(Bcfg2.Server.Plugin.GroupSpool, log) class CfgLint(Bcfg2.Server.Lint.ServerPlugin): + """ warn about usage of .cat and .diff files """ + def Run(self): - # about usage of .cat and .diff files - self.check_deltas() + for basename, entry in list(self.core.plugins['Cfg'].entries.items()): + self.check_entry(basename, entry) + @classmethod def Errors(cls): |