diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-02-07 14:19:33 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-07 14:19:33 -0800 |
| commit | ccd0f64fbb03880a2f68f1a949ff5ecff5ee88bd (patch) | |
| tree | c6aafe4b025ce3704e835b91456f8180d5585e67 /pym/portage/dep | |
| parent | Update dates in headers. (diff) | |
| download | portage-ccd0f64fbb03880a2f68f1a949ff5ecff5ee88bd.tar.gz portage-ccd0f64fbb03880a2f68f1a949ff5ecff5ee88bd.tar.bz2 portage-ccd0f64fbb03880a2f68f1a949ff5ecff5ee88bd.zip | |
expand_new_virtuals: fix last commit USE handling
Diffstat (limited to 'pym/portage/dep')
| -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 |