diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-15 02:35:35 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-15 02:35:35 +0000 |
| commit | 34fef8ebea9746bc62802ee1fe8fefc034e24122 (patch) | |
| tree | 696b0e0f332da643bab1064f3a639e34df632e42 | |
| parent | bd369956b2a2fbc019a655a372628998499156c0 (diff) | |
| download | portage-34fef8ebea9746bc62802ee1fe8fefc034e24122.tar.gz portage-34fef8ebea9746bc62802ee1fe8fefc034e24122.tar.bz2 portage-34fef8ebea9746bc62802ee1fe8fefc034e24122.zip | |
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
| -rw-r--r-- | pym/_emerge/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
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: |