| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-27 05:42:28 +0000 (Tue, 27 May 2008) |
| 3 |
New Revision: 10446 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Repoman only checks IUSE for USE deps, so don't evaluate conditional USE deps |
| 9 |
in this case. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2008-05-27 04:50:37 UTC (rev 10445) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2008-05-27 05:42:28 UTC (rev 10446) |
| 16 |
@@ -5410,6 +5410,7 @@ |
| 17 |
# for new-style virtuals. Repoman should enforce this. |
| 18 |
dep_keys = ["RDEPEND", "DEPEND", "PDEPEND"] |
| 19 |
portdb = trees[myroot]["porttree"].dbapi |
| 20 |
+ repoman = isinstance(mydbapi, portdbapi) |
| 21 |
if kwargs["use_binaries"]: |
| 22 |
portdb = trees[myroot]["bintree"].dbapi |
| 23 |
myvirtuals = mysettings.getvirtuals() |
| 24 |
@@ -5431,7 +5432,10 @@ |
| 25 |
raise portage.exception.ParseError( |
| 26 |
"invalid atom: '%s'" % x) |
| 27 |
|
| 28 |
- if isinstance(x, portage.dep.Atom) and x.use: |
| 29 |
+ # Repoman only checks IUSE for USE deps, so there's |
| 30 |
+ # no need to evaluate conditionals. |
| 31 |
+ if not repoman and \ |
| 32 |
+ myuse is not None and isinstance(x, portage.dep.Atom) and x.use: |
| 33 |
if x.use.conditional: |
| 34 |
evaluated_atom = portage.dep.remove_slot(x) |
| 35 |
if x.slot: |
| 36 |
|
| 37 |
-- |
| 38 |
gentoo-commits@l.g.o mailing list |
Archives