| 1 |
commit: 7e735aaa79ed26901c66b9444e4098b320abc2d5 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 7 11:43:06 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 7 11:43:06 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7e735aaa |
| 7 |
|
| 8 |
expand_new_virtuals: fix logic from prev commit |
| 9 |
|
| 10 |
We need to evaluate conditionals for dependency matching purposes, |
| 11 |
though the unevaluated atom will still be available later for other |
| 12 |
purposes. |
| 13 |
|
| 14 |
--- |
| 15 |
pym/portage/dep/dep_check.py | 6 +++++- |
| 16 |
1 files changed, 5 insertions(+), 1 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py |
| 19 |
index 3381af9..da9b4e5 100644 |
| 20 |
--- a/pym/portage/dep/dep_check.py |
| 21 |
+++ b/pym/portage/dep/dep_check.py |
| 22 |
@@ -123,7 +123,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", |
| 23 |
virt_atom = '=' + pkg.cpv |
| 24 |
if x.unevaluated_atom.use: |
| 25 |
virt_atom += str(x.unevaluated_atom.use) |
| 26 |
- virt_atom = Atom(virt_atom) |
| 27 |
+ virt_atom = Atom(virt_atom) |
| 28 |
+ virt_atom = virt_atom.evaluate_conditionals( |
| 29 |
+ pkg_use_enabled(graph_parent)) |
| 30 |
+ else: |
| 31 |
+ virt_atom = Atom(virt_atom) |
| 32 |
# According to GLEP 37, RDEPEND is the only dependency |
| 33 |
# type that is valid for new-style virtuals. Repoman |
| 34 |
# should enforce this. |
Archives