summaryrefslogtreecommitdiffstats
path: root/src/sbin/bcfg2-lint
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-05-18 10:44:50 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2011-05-18 10:44:50 -0400
commita7057ddac01f3e3a128448d806f4fb4e2e4876f6 (patch)
treeb8b2f62d66fab76005a4353fdd1a9de61a45cc1c /src/sbin/bcfg2-lint
parent834c2fb89af7f9cb6c626090caac7fe6903e88e8 (diff)
downloadbcfg2-a7057ddac01f3e3a128448d806f4fb4e2e4876f6.tar.gz
bcfg2-a7057ddac01f3e3a128448d806f4fb4e2e4876f6.tar.bz2
bcfg2-a7057ddac01f3e3a128448d806f4fb4e2e4876f6.zip
fixed several major bugs in bcfg2-lint Validate plugin
Diffstat (limited to 'src/sbin/bcfg2-lint')
-rwxr-xr-xsrc/sbin/bcfg2-lint7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 6bc34433e..3c9bc44b3 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -50,10 +50,13 @@ def run_plugin(plugin, plugin_name, setup=None, errorhandler=None,
errorhandler = get_errorhandler(config)
if config is not None and config.has_section(plugin_name):
- args.append(dict(config.items(plugin_name), **setup))
+ arg = setup
+ for key, val in config.items(plugin_name):
+ arg[key] = val
+ args.append(arg)
else:
args.append(setup)
-
+
# older versions of python do not support mixing *-magic and
# non-*-magic (e.g., "plugin(*args, files=files)", so we do this
# all with *-magic