diff --git a/gclient_utils.py b/gclient_utils.py index fcaa69a9a..f123496f4 100644 --- a/gclient_utils.py +++ b/gclient_utils.py @@ -1397,5 +1397,5 @@ def merge_conditions(*conditions): if not condition: condition = current_condition continue - condition = f'({condition}) AND ({current_condition})' + condition = f'({condition}) and ({current_condition})' return condition diff --git a/tests/gclient_utils_test.py b/tests/gclient_utils_test.py index e6157841b..978be886f 100755 --- a/tests/gclient_utils_test.py +++ b/tests/gclient_utils_test.py @@ -408,10 +408,10 @@ class GClientUtilsTest(trial_dir.TestCase): self.assertEqual('foo', gclient_utils.merge_conditions(None, 'foo')) - self.assertEqual('(foo) AND (bar)', + self.assertEqual('(foo) and (bar)', gclient_utils.merge_conditions('foo', 'bar')) - self.assertEqual('(foo or bar) AND (baz)', + self.assertEqual('(foo or bar) and (baz)', gclient_utils.merge_conditions('foo or bar', 'baz')) if __name__ == '__main__':