From: Zac Medico Date: Sun, 15 Feb 2009 02:35:35 +0000 (-0000) Subject: Fix merge order calculation so that the circular runtime path isn't entered X-Git-Tag: v2.2_rc24~192 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=34fef8ebea9746bc62802ee1fe8fefc034e24122;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. svn path=/main/trunk/; revision=12613 --- diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index f2c3f383a..c10f23b26 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7028,7 +7028,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: