Remove stale uninstall tasks from scheduled_uninstalls when necessary.

svn path=/main/trunk/; revision=10246

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 38dc14939a1637c708a4392a77ec5e231710277c..9de21126ddec4fb537d676bee6aecde5ca6c7474 100644 (file)
--- 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):