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 24fa6c9467eb8d064f3455e473c803af8275d9cc..b5589bcef61df7070f58231bc8ca0ba1d5197656 100755 (executable)
--- 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(