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
committerSol Jerome <sol.jerome@gmail.com>2011-06-14 12:36:45 -0500
commit065724b38235cb8ba4aa493f43a3f4f426ac1abd (patch)
tree4f65d53d6f2941a9cdc261bbc60c31e768de268a /src/sbin/bcfg2-lint
parent7ea350c0571ea8f551efa9fcfcc2eafc456dd9d9 (diff)
downloadbcfg2-065724b38235cb8ba4aa493f43a3f4f426ac1abd.tar.gz
bcfg2-065724b38235cb8ba4aa493f43a3f4f426ac1abd.tar.bz2
bcfg2-065724b38235cb8ba4aa493f43a3f4f426ac1abd.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