Only try to merge portage asap when the new version is different.

svn path=/main/trunk/; revision=15813

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index aa737b3b55f34487bc7bff970048f563cf37340e..2470e6a0d8cd33cf33d90d359ac8c9aade84c00a 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3341,7 +3341,9 @@ class depgraph(object):
                if replacement_portage == running_portage:
                        replacement_portage = None
 
-               if replacement_portage is not None:
+               if replacement_portage is not None and \
+                       (running_portage is None or \
+                       (running_portage.cpv != replacement_portage.cpv)):
                        # update from running_portage to replacement_portage asap
                        asap_nodes.append(replacement_portage)