summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-08 19:46:47 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-08 19:46:47 +0000
commit1b5ced0bb46c4b0669c3d45209e4f97d7e372822 (patch)
tree9eba86c1c4e98fb4da851a18726d3f135a396103
parentc967ef0ac94ca6270b90d2f579d662cd47af1ee3 (diff)
downloadportage-1b5ced0bb46c4b0669c3d45209e4f97d7e372822.tar.gz
portage-1b5ced0bb46c4b0669c3d45209e4f97d7e372822.tar.bz2
portage-1b5ced0bb46c4b0669c3d45209e4f97d7e372822.zip
Remove stale uninstall tasks from scheduled_uninstalls when necessary.
svn path=/main/trunk/; revision=10246
-rw-r--r--pym/_emerge/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 38dc14939..9de21126d 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4013,6 +4013,8 @@ class depgraph(object):
mygraph.remove(uninst_task)
except KeyError:
pass
+ scheduled_uninstalls.discard(uninst_task)
+
if uninst_task is not None and \
uninst_task not in ignored_uninstall_tasks and \
myblocker_uninstalls.contains(uninst_task):