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 f2c3f383ab308f8fccf249c161439a0e4149a4b2..c10f23b260a7354f923328f30ec6f3a6a533f1f2 100644 (file)
--- 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: