diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-07 03:43:06 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-07 03:43:06 -0800 |
| commit | 7e735aaa79ed26901c66b9444e4098b320abc2d5 (patch) | |
| tree | 27f524ad57bc79f3a33798e0b95a1b032c3d382d | |
| parent | a60acb9f203f56af8225dc7dda7c453a12fd6372 (diff) | |
| download | portage-7e735aaa79ed26901c66b9444e4098b320abc2d5.tar.gz portage-7e735aaa79ed26901c66b9444e4098b320abc2d5.tar.bz2 portage-7e735aaa79ed26901c66b9444e4098b320abc2d5.zip | |
expand_new_virtuals: fix logic from prev commit
We need to evaluate conditionals for dependency matching purposes,
though the unevaluated atom will still be available later for other
purposes.
| -rw-r--r-- | pym/portage/dep/dep_check.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 3381af9ca..da9b4e540 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -123,7 +123,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", virt_atom = '=' + pkg.cpv if x.unevaluated_atom.use: virt_atom += str(x.unevaluated_atom.use) - virt_atom = Atom(virt_atom) + virt_atom = Atom(virt_atom) + virt_atom = virt_atom.evaluate_conditionals( + pkg_use_enabled(graph_parent)) + else: + virt_atom = Atom(virt_atom) # According to GLEP 37, RDEPEND is the only dependency # type that is valid for new-style virtuals. Repoman # should enforce this. |