diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-15 01:21:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-15 01:21:21 -0700 |
| commit | ea71e72f1294e1aefb6f234e1b2ffc906ea12289 (patch) | |
| tree | 352ce9cad1b1f765ecd56b918c362e9401d3115c | |
| parent | 9f29682eb4429e5b2ac7cbb54361fb24092ab0fd (diff) | |
| download | portage-ea71e72f1294e1aefb6f234e1b2ffc906ea12289.tar.gz portage-ea71e72f1294e1aefb6f234e1b2ffc906ea12289.tar.bz2 portage-ea71e72f1294e1aefb6f234e1b2ffc906ea12289.zip | |
Tweak stack_lists() strict_warn_for_unmatched_removal logic.
| -rw-r--r-- | pym/portage/util/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 5577a7ecd..248c33bf2 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -258,8 +258,9 @@ def stack_lists(lists, incremental=1, remember_source_file=False, try: new_list.pop(token[1:]) except KeyError: - if strict_warn_for_unmatched_removal or \ - not (source_file and token_key in matched_removals): + if source_file and \ + (strict_warn_for_unmatched_removal or \ + token_key not in matched_removals): unmatched_removals.setdefault(source_file, set()).add(token) else: matched_removals.add(token_key) |