Reset the state variables for leaf node selection in depgraph.altlist()

when appropriate.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index bdb8e88e4f4788824bf15baede8253f322981d30..ef6c2de32c16f35c2c6409539c54020e08196e8c 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3568,6 +3568,12 @@ class depgraph(object):
                                                else:
                                                        ignored_uninstall_tasks.add(node)
                                                        break
+
+                                       # After dropping an Uninstall task, reset
+                                       # the state variables for leaf node selection and
+                                       # continue trying to select leaf nodes.
+                                       prefer_asap = True
+                                       accept_root_node = False
                                        continue
 
                        if not selected_nodes: