From 7e735aaa79ed26901c66b9444e4098b320abc2d5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 7 Feb 2011 03:43:06 -0800 Subject: 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. --- pym/portage/dep/dep_check.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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. -- cgit v1.2.3-1-g7c22