1 |
Author: zmedico |
2 |
Date: 2008-04-11 20:11:31 +0000 (Fri, 11 Apr 2008) |
3 |
New Revision: 9839 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/__init__.py |
7 |
Log: |
8 |
When dep_check() expands new-style virtuals, use USE flags from aux_get |
9 |
calls to evaluate any conditionals that the depstrings might contain. This |
10 |
works properly for ebuilds now that aux_get() is backed by Package instances |
11 |
containing the correct USE. |
12 |
|
13 |
|
14 |
Modified: main/trunk/pym/portage/__init__.py |
15 |
=================================================================== |
16 |
--- main/trunk/pym/portage/__init__.py 2008-04-11 19:55:50 UTC (rev 9838) |
17 |
+++ main/trunk/pym/portage/__init__.py 2008-04-11 20:11:31 UTC (rev 9839) |
18 |
@@ -5364,12 +5364,16 @@ |
19 |
else: |
20 |
a = ['||'] |
21 |
for y in pkgs: |
22 |
- depstring = " ".join(y[2].aux_get(y[0], dep_keys)) |
23 |
+ cpv, pv_split, db = y |
24 |
+ depstring = " ".join(db.aux_get(cpv, dep_keys)) |
25 |
+ use_split = db.aux_get(cpv, ["USE"])[0].split() |
26 |
+ pkg_kwargs = kwargs.copy() |
27 |
+ pkg_kwargs["myuse"] = use_split |
28 |
if edebug: |
29 |
print "Virtual Parent: ", y[0] |
30 |
print "Virtual Depstring:", depstring |
31 |
mycheck = dep_check(depstring, mydbapi, mysettings, myroot=myroot, |
32 |
- trees=trees, **kwargs) |
33 |
+ trees=trees, **pkg_kwargs) |
34 |
if not mycheck[0]: |
35 |
raise portage.exception.ParseError( |
36 |
"%s: %s '%s'" % (y[0], mycheck[1], depstring)) |
37 |
|
38 |
-- |
39 |
gentoo-commits@l.g.o mailing list |