diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-09-13 15:25:57 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-13 07:05:59 -0700 |
| commit | 2380617b66056bbdeee5c219e018acccbb9183e3 (patch) | |
| tree | 4e28c91fdec68738001f97bcb3c40682ef8498f6 /pym/portage | |
| parent | 901d18381c277784d243e33cbad58480c9f1f8d5 (diff) | |
| download | portage-2380617b66056bbdeee5c219e018acccbb9183e3.tar.gz portage-2380617b66056bbdeee5c219e018acccbb9183e3.tar.bz2 portage-2380617b66056bbdeee5c219e018acccbb9183e3.zip | |
Don't miss a "missing IUSE" because of [foo?] -> [] evaluations.
This patch also drops flags with EAPI 4 use dep defaults from use.required.
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/dep/__init__.py | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index b1d08e267..f0d7e0190 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -684,11 +684,7 @@ class _use_dep(object): if not isinstance(self.tokens, tuple): self.tokens = tuple(self.tokens) - self.required = frozenset(chain( - enabled_flags, - disabled_flags, - *conditional.values() - )) + self.required = frozenset(no_default) self.enabled = frozenset(enabled_flags) self.disabled = frozenset(disabled_flags) @@ -782,10 +778,8 @@ class _use_dep(object): else: tokens.append(x) - required = chain(enabled_flags, disabled_flags) - return _use_dep(tokens, enabled_flags=enabled_flags, disabled_flags=disabled_flags, \ - missing_enabled=self.missing_enabled, missing_disabled=self.missing_disabled, required=required) + missing_enabled=self.missing_enabled, missing_disabled=self.missing_disabled, required=self.required) def violated_conditionals(self, other_use, is_valid_flag, parent_use=None): """ @@ -897,15 +891,9 @@ class _use_dep(object): tokens.append(x) conditional.setdefault("disabled", set()).add(flag) - required = frozenset(chain( - enabled_flags, - disabled_flags, - *conditional.values() - )) - return _use_dep(tokens, enabled_flags=enabled_flags, disabled_flags=disabled_flags, \ missing_enabled=self.missing_enabled, missing_disabled=self.missing_disabled, \ - conditional=conditional, required=required) + conditional=conditional, required=self.required) def _eval_qa_conditionals(self, use_mask, use_force): """ @@ -958,10 +946,8 @@ class _use_dep(object): else: tokens.append(x) - required = chain(enabled_flags, disabled_flags) - return _use_dep(tokens, enabled_flags=enabled_flags, disabled_flags=disabled_flags, \ - missing_enabled=missing_enabled, missing_disabled=missing_disabled, required=required) + missing_enabled=missing_enabled, missing_disabled=missing_disabled, required=self.required) if sys.hexversion < 0x3000000: _atom_base = unicode |