From: Zac Medico Date: Wed, 11 Mar 2009 05:14:58 +0000 (-0000) Subject: Fix merge order calculation so that the circular runtime path isn't entered X-Git-Tag: v2.1.6.8~186 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a39b66a3616a7831d9093d46c0d9e5d65fbc1c4f;p=portage.git Fix merge order calculation so that the circular runtime path isn't entered when it's possible to select a node that only has unsatisfied PDEPEND. This reverts an unintended change from the patch for bug #250020, and solves a problem with libperl being merged after perl when building stage 1. (trunk r12613) svn path=/main/branches/2.1.6/; revision=12891 --- diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index dcbdfee4a..b1e38a918 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7012,7 +7012,8 @@ class depgraph(object): break if not selected_nodes and \ not (prefer_asap and asap_nodes): - for i in xrange(priority_range.NONE, priority_range.SOFT + 1): + for i in xrange(priority_range.NONE, + priority_range.MEDIUM_SOFT + 1): ignore_priority = priority_range.ignore_priority[i] nodes = get_nodes(ignore_priority=ignore_priority) if nodes: