Tweak stack_lists() strict_warn_for_unmatched_removal logic.

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 5577a7ecd299bb4d25d0107388c7ab610944c4b9..248c33bf28fefd0d03a30a00b4466dc8b12efc02 100644 (file)
--- 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)