diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-07 16:42:37 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-07 16:42:37 -0800 |
| commit | 15389929b684b41801ffc880c4a4e6714e4245b6 (patch) | |
| tree | 57995cfe7554948a7721904eed70a379ea8663c5 | |
| parent | ccd0f64fbb03880a2f68f1a949ff5ecff5ee88bd (diff) | |
| download | portage-15389929b684b41801ffc880c4a4e6714e4245b6.tar.gz portage-15389929b684b41801ffc880c4a4e6714e4245b6.tar.bz2 portage-15389929b684b41801ffc880c4a4e6714e4245b6.zip | |
expand_new_virtuals: handle None for myusev2.2.0_alpha22
| -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 9373ecbbc..ca656019d 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -125,7 +125,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", virt_atom += str(x.unevaluated_atom.use) virt_atom = Atom(virt_atom) if graph_parent is None: - virt_atom = virt_atom.evaluate_conditionals(myuse) + if myuse is None: + virt_atom = virt_atom.evaluate_conditionals( + mysettings.get("PORTAGE_USE", "").split()) + else: + virt_atom = virt_atom.evaluate_conditionals(myuse) else: virt_atom = virt_atom.evaluate_conditionals( pkg_use_enabled(graph_parent)) |