1 |
Author: zmedico |
2 |
Date: 2008-05-28 22:06:45 +0000 (Wed, 28 May 2008) |
3 |
New Revision: 10467 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Update the fix from bug #220341 to protect USE deps from being neglected. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-28 08:52:07 UTC (rev 10466) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-28 22:06:45 UTC (rev 10467) |
15 |
@@ -3067,12 +3067,21 @@ |
16 |
# the newly built package still won't have the expected slot. |
17 |
# Therefore, assume that such SLOT dependencies are already |
18 |
# satisfied rather than forcing a rebuild. |
19 |
- if installed and not cpv_list and matched_packages \ |
20 |
- and portage.dep.dep_getslot(atom): |
21 |
+ if installed and not cpv_list and \ |
22 |
+ matched_packages and atom.slot: |
23 |
for pkg in matched_packages: |
24 |
- if vardb.cpv_exists(pkg.cpv): |
25 |
+ if not vardb.cpv_exists(pkg.cpv): |
26 |
+ continue |
27 |
+ # Remove the slot from the atom and verify that |
28 |
+ # the package matches the resulting atom. |
29 |
+ atom_without_slot = portage.dep.remove_slot(atom) |
30 |
+ if atom.use: |
31 |
+ atom_without_slot += str(atom.use) |
32 |
+ atom_without_slot = portage.dep.Atom(atom_without_slot) |
33 |
+ if portage.match_from_list( |
34 |
+ atom_without_slot, [pkg]): |
35 |
cpv_list = [pkg.cpv] |
36 |
- break |
37 |
+ break |
38 |
|
39 |
if not cpv_list: |
40 |
continue |
41 |
|
42 |
-- |
43 |
gentoo-commits@l.g.o mailing list |