diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-02-05 21:26:38 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-02-05 21:26:38 +0000 |
| commit | abc42459e4e7cb048500b528386fc3005809c91a (patch) | |
| tree | e5f13d5f720ff0ff409d3007385f1ff25bc84ce7 /src/lib/Client | |
| parent | 281bcac03631775819d627c946813696c05cc900 (diff) | |
| download | bcfg2-abc42459e4e7cb048500b528386fc3005809c91a.tar.gz bcfg2-abc42459e4e7cb048500b528386fc3005809c91a.tar.bz2 bcfg2-abc42459e4e7cb048500b528386fc3005809c91a.zip | |
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
Diffstat (limited to 'src/lib/Client')
| -rw-r--r-- | src/lib/Client/Frame.py | 9 |
1 files 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 @@ -60,10 +60,6 @@ class Frame: 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)) except Bcfg2.Client.Tools.toolInstantiationError: @@ -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']: |