Fix depgraph._serialize_tasks() so that portage-9999 is always promoted

to the front of the merge list when it is reinstalled.

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 3be0a196b2cf8fc09cd515db90c180fd92a251d8..aa1427b440b316fa8af5d5c2d53dd59a2c7ad188 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3602,7 +3602,9 @@ class depgraph(object):
 
                if replacement_portage is not None and \
                        (running_portage is None or \
-                       (running_portage.cpv != replacement_portage.cpv)):
+                       running_portage.cpv != replacement_portage.cpv or \
+                       '9999' in replacement_portage.cpv or \
+                       'git' in replacement_portage.inherited):
                        # update from running_portage to replacement_portage asap
                        asap_nodes.append(replacement_portage)