From a7057ddac01f3e3a128448d806f4fb4e2e4876f6 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 18 May 2011 10:44:50 -0400
Subject: fixed several major bugs in bcfg2-lint Validate plugin

---
 src/sbin/bcfg2-lint | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/sbin')

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
-- 
cgit v1.2.3-1-g7c22