From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 17 May 2008 23:27:42 +0000 (-0000)
Subject: Fix th logic from the previous commit. (trunk r10350)
X-Git-Tag: v2.1.5.1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55ea662ca697881bd8571a1be89b17a1bfad000b;p=portage.git

Fix th logic from the previous commit. (trunk r10350)

svn path=/main/branches/2.1.2/; revision=10355
---

diff --git a/bin/emerge b/bin/emerge
index 24fa6c946..b5589bcef 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3784,13 +3784,16 @@ class depgraph(object):
 
 		if replacement_portage:
 			replacement_portage = replacement_portage[0]
-			asap_nodes.append(replacement_portage)
 		else:
 			replacement_portage = None
 
 		if replacement_portage == running_portage:
 			replacement_portage = None
 
+		if replacement_portage is not None:
+			# update from running_portage to replacement_portage asap
+			asap_nodes.append(replacement_portage)
+
 		if running_portage is not None:
 			try:
 				portage_rdepend = self._select_atoms_highest_available(