From d866fa5337e5ad39bd0e37d4ebe1fcd2d12b98fb Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 23 Mar 2019 15:23:22 +0200 Subject: Fix: all conds must match --- effitool | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/effitool b/effitool index b41eea7..048e3ec 100755 --- a/effitool +++ b/effitool @@ -314,12 +314,6 @@ class ContainsCond(SearchCond): return pattern in value -class NotContainsCond(SearchCond): - - def op(self, value, pattern): - return pattern not in value - - class RegexCond(SearchCond): def op(self, value, pattern): @@ -473,10 +467,8 @@ class Tool: matches = {} for rid, m in members.items(): - for c in conds: - if c.matches(m): - matches[rid] = m - break + if all(c.matches(m) for c in conds): + matches[rid] = m self._format_json(matches, sys.stdout) def _format_json(self, obj, output): -- cgit v1.2.1