summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-31 22:12:44 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-31 22:12:44 -0700
commitc050d9441afa4523c1a7a5341e3daae90e4c2a4e (patch)
treed5b4d1d082f3e9080cba3a93390b1608764b3bfa
parenta2bc929364a83bd4c7fb6f3f6c136394e974b6a3 (diff)
downloadportage-c050d9441afa4523c1a7a5341e3daae90e4c2a4e.tar.gz
portage-c050d9441afa4523c1a7a5341e3daae90e4c2a4e.tar.bz2
portage-c050d9441afa4523c1a7a5341e3daae90e4c2a4e.zip
Fix depgraph._serialize_tasks() so that portage-9999 is always promoted
to the front of the merge list when it is reinstalled.
-rw-r--r--pym/_emerge/depgraph.py4
1 files changed, 3 insertions, 1 deletions
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)