From ccd0f64fbb03880a2f68f1a949ff5ecff5ee88bd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 7 Feb 2011 14:19:33 -0800 Subject: expand_new_virtuals: fix last commit USE handling --- pym/portage/dep/dep_check.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index 60896c06e..9373ecbbc 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -124,8 +124,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", if x.unevaluated_atom.use: virt_atom += str(x.unevaluated_atom.use) virt_atom = Atom(virt_atom) - virt_atom = virt_atom.evaluate_conditionals( - pkg_use_enabled(graph_parent)) + if graph_parent is None: + virt_atom = virt_atom.evaluate_conditionals(myuse) + else: + 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 -- cgit v1.2.3-1-g7c22