Remove stale uninstall tasks from scheduled_uninstalls when necessary.

(trunk r10246)

svn path=/main/branches/2.1.2/; revision=10247

diff --git a/bin/emerge b/bin/emerge
index 1cf44d2ed51432b0f5805303a4e5b791e5a3fba4..4bfdac4e2dbcbad2697e5cc904bc564ef885f754 100755 (executable)
--- 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):