From abc42459e4e7cb048500b528386fc3005809c91a Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Mon, 5 Feb 2007 21:26:38 +0000 Subject: Fix overenthusiastic yum override (Reported by Pedro) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2785 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Frame.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py index a297ef389..b14984491 100644 --- a/src/lib/Client/Frame.py +++ b/src/lib/Client/Frame.py @@ -59,10 +59,6 @@ class Frame: except ImportError: continue - for tool in tclass.values(): - for conflict in getattr(tool, 'conflicts', []): - tclass.pop(conflict) - for tool in tclass.values(): try: self.tools.append(tool(self.logger, setup, config, self.states)) @@ -71,6 +67,11 @@ class Frame: 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']: -- cgit v1.2.3-1-g7c22