summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-12 17:48:50 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-12 17:48:50 +0000
commit080e480a284db7563aae8f38772bcdc7ca6cdd64 (patch)
treebc04828f620b718d25c4c55034cb215f9451bfb7
parentMention the blocker_lookahead parameter in the depgraph._greedy_slots() (diff)
downloadportage-multirepo-080e480a284db7563aae8f38772bcdc7ca6cdd64.tar.gz
portage-multirepo-080e480a284db7563aae8f38772bcdc7ca6cdd64.tar.bz2
portage-multirepo-080e480a284db7563aae8f38772bcdc7ca6cdd64.zip
When selecting greedy package inside depgraph._greedy_slots(), make surev2.1.6.5
the selected packages have the same cp as the highest selected version. (trunk r12490) svn path=/main/branches/2.1.6/; revision=12491
-rw-r--r--pym/_emerge/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 5a00510a..9d2d62d0 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5648,7 +5648,8 @@ class depgraph(object):
slot = slots.pop()
slot_atom = portage.dep.Atom("%s:%s" % (highest_pkg.cp, slot))
pkg, in_graph = self._select_package(root_config.root, slot_atom)
- if pkg is not None and pkg < highest_pkg:
+ if pkg is not None and \
+ pkg.cp == highest_pkg.cp and pkg < highest_pkg:
greedy_pkgs.append(pkg)
if not greedy_pkgs:
return []