Clean up tool driver conflict code

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2769 ce84e21b-d406-0410-9b95-82705330c041

2 files changed, 12 insertions, 10 deletions

diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index 879ab0be2..b51b5d7ca 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -50,27 +50,27 @@ class Frame:
             tools = self.setup['drivers'].split(',')
         else:
             tools = Bcfg2.Client.Tools.__all__[:]
-        tmods = {}
+        tclass = {}
         for tool in tools:
             tool_class = "Bcfg2.Client.Tools.%s" % tool
             try:
-                tmods[tool] = __import__(tool_class, globals(), locals(), ['*'])
+                tclass[tool] = getattr(__import__(tool_class, globals(), locals(), ['*']),
+                                       tool)
             except ImportError:
                 continue
 
-        for (tool, mod) in tmods.iteritems():
+        for tool in tclass.values():
+            for conflict in getattr(tool, 'conflicts', []):
+                tclass.pop(conflict)
+
+        for tool in tclass.values():
             try:
-                self.tools.append(getattr(mod, tool)(self.logger, setup, config, self.states))
+                self.tools.append(tool(self.logger, setup, config, self.states))
             except Bcfg2.Client.Tools.toolInstantiationError:
                 continue
             except:
                 self.logger.error("Failed to instantiate tool %s" % (tool), exc_info=1)
 
-        for tool in self.tools[:]:
-            for conflict in getattr(tool, 'conflicts', []):
-                [self.tools.remove(item) for item in self.tools \
-                 if item.__name__ == conflict]
-
         self.logger.info("Loaded tool drivers:")
         self.logger.info([tool.__name__ for tool in self.tools])
         if not self.setup['dryrun']:
diff --git a/src/lib/Client/Tools/SYSV.py b/src/lib/Client/Tools/SYSV.py
index ad9bb00c5..002e7ae22 100644
--- a/src/lib/Client/Tools/SYSV.py
+++ b/src/lib/Client/Tools/SYSV.py
@@ -57,7 +57,9 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
                              (entry.get('version'), entry.get('name')))[0]
 
         if cmdrc != 0:
-            self.logger.debug("Package %s version incorrect" % entry.get('name'))
+            self.logger.debug("Package %s version incorrect: have %s want %s" \
+                              % (entry.get('name'), self.installed[entry.get('name')],
+                                 entry.get('version')))
         else:
             if self.setup['quick'] or entry.attrib.get('verify', 'true') == 'false':
                 return True