Merged from trunk 10245:10246

   | 10246   | Remove stale uninstall tasks from scheduled_uninstalls when  |
   | zmedico | necessary.                                                   |

svn path=/main/branches/prefix/; revision=10249

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index fbb3ea57f22bbfb338c78a09ce1cd416de59e428..332c322151b1e1ddc7511125fc4f5b9e69dc05c1 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4038,6 +4038,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):