From ea71e72f1294e1aefb6f234e1b2ffc906ea12289 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 15 Sep 2010 01:21:21 -0700 Subject: Tweak stack_lists() strict_warn_for_unmatched_removal logic. --- pym/portage/util/__init__.py | 5 +++-- 1 file 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) -- cgit v1.2.3-1-g7c22