diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-14 08:16:34 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-14 08:16:34 -0500 |
| commit | 71da6134ceeb356f48a6c9dd4c1cb409c10d55bb (patch) | |
| tree | 36d74d5ec56c168c7201497525e01a89c621b0c3 /src/sbin | |
| parent | ccde3230172f1e5b648cc8e807d3943ef201b4d5 (diff) | |
| download | bcfg2-71da6134ceeb356f48a6c9dd4c1cb409c10d55bb.tar.gz bcfg2-71da6134ceeb356f48a6c9dd4c1cb409c10d55bb.tar.bz2 bcfg2-71da6134ceeb356f48a6c9dd4c1cb409c10d55bb.zip | |
read bcfg2-lint plugin list properly
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-lint | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint index b041a0d31..dbe3430d7 100755 --- a/src/sbin/bcfg2-lint +++ b/src/sbin/bcfg2-lint @@ -90,10 +90,7 @@ def load_plugins(setup): elif "bcfg2-repo-validate" in sys.argv[0]: plugin_list = 'RequiredAttrs,Validate'.split(',') else: - try: - plugin_list = setup.cfp.get('lint', 'plugins').split(',') - except (ConfigParser.NoOptionError, ConfigParser.NoSectionError): - plugin_list = Bcfg2.Server.Lint.__all__ + plugin_list = setup['lint_plugins'] allplugins = dict() for plugin in plugin_list: @@ -144,7 +141,7 @@ def main(): showerrors=Bcfg2.Options.LINT_SHOW_ERRORS, stdin=Bcfg2.Options.LINT_FILES_ON_STDIN, schema=Bcfg2.Options.SCHEMA_PATH, - plugins=Bcfg2.Options.SERVER_PLUGINS) + lint_plugins=Bcfg2.Options.LINT_PLUGINS) optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS) optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS) setup = Bcfg2.Options.OptionParser(optinfo) @@ -156,6 +153,7 @@ def main(): Bcfg2.Logger.setup_logging('bcfg2-info', **log_args) setup.cfp.read(setup['lint_config']) + setup.reparse() if setup['stdin']: files = [s.strip() for s in sys.stdin.readlines()] |