diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-12 17:48:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-12 17:48:37 +0000 |
| commit | 67cc81bc395010aae55606879c5b0fe515a9be36 (patch) | |
| tree | 87182f4bbdfd4709ac83fcbc7c87cd3823354862 | |
| parent | f9ab31d01f4cf9df34d900728a3b47f089e12e57 (diff) | |
| download | portage-67cc81bc395010aae55606879c5b0fe515a9be36.tar.gz portage-67cc81bc395010aae55606879c5b0fe515a9be36.tar.bz2 portage-67cc81bc395010aae55606879c5b0fe515a9be36.zip | |
When selecting greedy package inside depgraph._greedy_slots(), make surev2.2_rc21
the selected packages have the same cp as the highest selected version.
svn path=/main/trunk/; revision=12490
| -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 1bf5a9514..9e8d343a9 100644 --- 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 [] |