From 76d825e024588dc0aef9bde910b17d2175f266f2 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 1 Feb 2007 19:44:45 +0000 Subject: Implement complete Yum solution * Add Yum into default loaded drivers * Add support for Yum to not use -y * Fix driver conflict setup git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2754 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Frame.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/lib/Client/Frame.py') diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py index ac99c28ba..879ab0be2 100644 --- a/src/lib/Client/Frame.py +++ b/src/lib/Client/Frame.py @@ -58,10 +58,6 @@ class Frame: except ImportError: continue - for tool in tools: - for conflict in getattr(tool, 'conflicts', []): - del tmods[conflict] - for (tool, mod) in tmods.iteritems(): try: self.tools.append(getattr(mod, tool)(self.logger, setup, config, self.states)) @@ -70,6 +66,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