When selecting greedy package inside depgraph._greedy_slots(), make sure v2.1.6.5
authorZac Medico <zmedico@gentoo.org>
Mon, 12 Jan 2009 17:48:50 +0000 (17:48 -0000)
committerZac Medico <zmedico@gentoo.org>
Mon, 12 Jan 2009 17:48:50 +0000 (17:48 -0000)
the selected packages have the same cp as the highest selected version.
(trunk r12490)

svn path=/main/branches/2.1.6/; revision=12491

pym/_emerge/__init__.py

index 5a00510a6a705787373ff8dcf70433b8e6748d3f..9d2d62d03b1fa1647ca08bb023ab10002c9c3d84 100644 (file)
@@ -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 []