Only try to merge portage asap when the new version is different. (trunk r15813)

svn path=/main/branches/2.1.7/; revision=15814

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index a9b4ca5549d0a9eda76d54176a3e41752ddbf4cf..8fb1d142b0d1562e209679efc5131c34e4e2dad4 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)