From c050d9441afa4523c1a7a5341e3daae90e4c2a4e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 31 Aug 2010 22:12:44 -0700 Subject: Fix depgraph._serialize_tasks() so that portage-9999 is always promoted to the front of the merge list when it is reinstalled. --- pym/_emerge/depgraph.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/depgraph.py') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 3be0a196b..aa1427b44 100644 --- 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) -- cgit v1.2.3-1-g7c22