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:53:37 -0800 |
| commit | 8954c253e23261ff3674a96bc02ea7c4487c138b (patch) | |
| tree | 0bd3c247b015e14596f945a874d08a4d433e89a1 | |
| parent | 7f2874ee2366a1a94534e9b3d97bd2f43573d4d4 (diff) | |
| download | portage-8954c253e23261ff3674a96bc02ea7c4487c138b.tar.gz portage-8954c253e23261ff3674a96bc02ea7c4487c138b.tar.bz2 portage-8954c253e23261ff3674a96bc02ea7c4487c138b.zip | |
expand_new_virtuals: handle None for myusev2.1.9.38
| -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)) |