When selecting greedy package inside depgraph._greedy_slots(), make sure

the selected packages have the same cp as the highest selected version.

svn path=/main/trunk/; revision=12490

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 1bf5a9514bc4a946ef94e8e15dff5288358efb55..9e8d343a9e988f62b923e373d197c38226527ad9 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5664,7 +5664,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 []