From: Zac Medico Date: Wed, 10 Mar 2010 00:29:24 +0000 (-0000) Subject: Only try to merge portage asap when the new version is different. X-Git-Tag: v2.2_rc67 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=63ab485cd530dcdaf7472dfd5b69a44dae1ebd82;p=portage.git 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 aa737b3b5..2470e6a0d 100644 --- 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)