diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-02-07 14:19:33 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-02-07 16:53:30 -0800 |
commit | 7f2874ee2366a1a94534e9b3d97bd2f43573d4d4 (patch) | |
tree | 78ec78e76a21d299eaf32a104c053b7615c0bdad | |
parent | e5bfb31285cd660d60e09bf81dbfae5f39fe55ed (diff) | |
download | portage-7f2874ee2366a1a94534e9b3d97bd2f43573d4d4.tar.gz portage-7f2874ee2366a1a94534e9b3d97bd2f43573d4d4.tar.bz2 portage-7f2874ee2366a1a94534e9b3d97bd2f43573d4d4.zip |
expand_new_virtuals: fix last commit USE handling
-rw-r--r-- | pym/portage/dep/dep_check.py | 7 |
1 files changed, 5 insertions, 2 deletions
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 |