1 |
Author: zmedico |
2 |
Date: 2009-01-12 17:48:37 +0000 (Mon, 12 Jan 2009) |
3 |
New Revision: 12490 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
When selecting greedy package inside depgraph._greedy_slots(), make sure |
9 |
the selected packages have the same cp as the highest selected version. |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2009-01-12 17:37:07 UTC (rev 12489) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2009-01-12 17:48:37 UTC (rev 12490) |
16 |
@@ -5664,7 +5664,8 @@ |
17 |
slot = slots.pop() |
18 |
slot_atom = portage.dep.Atom("%s:%s" % (highest_pkg.cp, slot)) |
19 |
pkg, in_graph = self._select_package(root_config.root, slot_atom) |
20 |
- if pkg is not None and pkg < highest_pkg: |
21 |
+ if pkg is not None and \ |
22 |
+ pkg.cp == highest_pkg.cp and pkg < highest_pkg: |
23 |
greedy_pkgs.append(pkg) |
24 |
if not greedy_pkgs: |
25 |
return [] |