diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2014-03-26 06:52:42 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-03-26 06:52:42 -0700 |
| commit | 276611668673967d8dd76caebb1e427dd10b3ff2 (patch) | |
| tree | 479b3b5dccbc0dfd96c617908eb21946e6785eeb /pym/portage/dbapi/_expand_new_virt.py | |
| parent | Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage into ... (diff) | |
| download | portage-276611668673967d8dd76caebb1e427dd10b3ff2.tar.gz portage-276611668673967d8dd76caebb1e427dd10b3ff2.tar.bz2 portage-276611668673967d8dd76caebb1e427dd10b3ff2.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/portage into public_apipublic_api
Diffstat (limited to 'pym/portage/dbapi/_expand_new_virt.py')
| -rw-r--r-- | pym/portage/dbapi/_expand_new_virt.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pym/portage/dbapi/_expand_new_virt.py b/pym/portage/dbapi/_expand_new_virt.py index d379b4c1d..9aa603d11 100644 --- a/pym/portage/dbapi/_expand_new_virt.py +++ b/pym/portage/dbapi/_expand_new_virt.py @@ -1,8 +1,11 @@ -# Copyright 2011 Gentoo Foundation +# Copyright 2011-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +from __future__ import unicode_literals + import portage from portage.dep import Atom, _get_useflag_re +from portage.eapi import _get_eapi_attrs def expand_new_virt(vardb, atom): """ @@ -44,6 +47,7 @@ def expand_new_virt(vardb, atom): yield atom continue + eapi_attrs = _get_eapi_attrs(eapi) # Validate IUSE and IUSE, for early detection of vardb corruption. useflag_re = _get_useflag_re(eapi) valid_iuse = [] @@ -54,7 +58,11 @@ def expand_new_virt(vardb, atom): valid_iuse.append(x) valid_iuse = frozenset(valid_iuse) - iuse_implicit_match = vardb.settings._iuse_implicit_match + if eapi_attrs.iuse_effective: + iuse_implicit_match = vardb.settings._iuse_effective_match + else: + iuse_implicit_match = vardb.settings._iuse_implicit_match + valid_use = [] for x in use.split(): if x in valid_iuse or iuse_implicit_match(x): |