summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-08 19:47:28 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-08 19:47:28 +0000
commitbe4ff01714a86eda1aa0508cbabc19d9c4bcdf08 (patch)
tree9ca8d7ee1e4bb7dbdf2d119897520c1812b2c1a5 /bin
parent2e6fc4b71d7d5dd40c344c0e4c24680c9c8a1eee (diff)
downloadportage-be4ff01714a86eda1aa0508cbabc19d9c4bcdf08.tar.gz
portage-be4ff01714a86eda1aa0508cbabc19d9c4bcdf08.tar.bz2
portage-be4ff01714a86eda1aa0508cbabc19d9c4bcdf08.zip
Remove stale uninstall tasks from scheduled_uninstalls when necessary.
(trunk r10246) svn path=/main/branches/2.1.2/; revision=10247
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index 1cf44d2ed..4bfdac4e2 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4165,6 +4165,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):