summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2005-11-30 16:38:29 +0000
committerNarayan Desai <desai@mcs.anl.gov>2005-11-30 16:38:29 +0000
commitced38727d5a9de43116fbe3c67d1cbe238c0cf74 (patch)
tree5dc52388fcd0c3e0caad937368b7426ddef4f9a7 /src
parent8be9308cb9abc4c1482765ba8efd1b8969a010a1 (diff)
downloadbcfg2-ced38727d5a9de43116fbe3c67d1cbe238c0cf74.tar.gz
bcfg2-ced38727d5a9de43116fbe3c67d1cbe238c0cf74.tar.bz2
bcfg2-ced38727d5a9de43116fbe3c67d1cbe238c0cf74.zip
fix longstanding faulty reporting of packages included in the config
multiple times (Logical change 1.374) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1574 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Toolset.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py
index b5bbc582d..dd1c17be4 100644
--- a/src/lib/Client/Toolset.py
+++ b/src/lib/Client/Toolset.py
@@ -544,11 +544,12 @@ class Toolset(object):
if cmdrc == 0:
self.CondPrint('verbose', "Single Pass Succeded")
# set all package states to true and flush workqueues
- badpkgs = [entry for entry in self.states.keys() if entry in pkglist
- and not self.states[entry]]
- for entry in badpkgs:
+ pkgnames = [pkg.get('name') for pkg in pkglist]
+ for entry in [entry for entry in self.states.keys()
+ if entry.tag == 'Package' and entry.get('type') == pkgtype and entry.get('name') in pkgnames]:
self.CondPrint('debug', 'Setting state to true for pkg %s' % (entry.get('name')))
self.states[entry] = True
+ [self.pkgwork[listname].remove(entry) for listname in ['add', 'update'] if self.pkgwork[listname].count(entry)]
self.Refresh()
else:
self.CondPrint("verbose", "Single Pass Failed")