diff options
| author | Zac Medico <zmedico@gentoo.org> | 2013-01-21 13:30:13 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-01-21 13:30:13 -0800 |
| commit | 2f9ee1635ca33f347e6eaa523e965c7172cd481e (patch) | |
| tree | e19242a6763b358ea70156c911886e34c250c592 /pym/portage/dep/__init__.py | |
| parent | 24e65d4490c9650bc446cf342a2fc04326d17fb8 (diff) | |
| download | portage-2f9ee1635ca33f347e6eaa523e965c7172cd481e.tar.gz portage-2f9ee1635ca33f347e6eaa523e965c7172cd481e.tar.bz2 portage-2f9ee1635ca33f347e6eaa523e965c7172cd481e.zip | |
Fix default use match for implicit IUSE.v2.2.0_alpha159
This will fix bug #453400, which was triggered by inconsistency
between the enabled USE and the effective missing_disabled set used
in matching logic, due to implicit IUSE.
Diffstat (limited to 'pym/portage/dep/__init__.py')
| -rw-r--r-- | pym/portage/dep/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 511753116..1edbab76f 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -2282,9 +2282,11 @@ def match_from_list(mydep, candidate_list): continue if mydep.use: - - missing_enabled = mydep.use.missing_enabled.difference(x.iuse.all) - missing_disabled = mydep.use.missing_disabled.difference(x.iuse.all) + is_valid_flag = x.iuse.is_valid_flag + missing_enabled = frozenset(flag for flag in + mydep.use.missing_enabled if not is_valid_flag(flag)) + missing_disabled = frozenset(flag for flag in + mydep.use.missing_disabled if not is_valid_flag(flag)) if mydep.use.enabled: if any(f in mydep.use.enabled for f in missing_disabled): |