From f31175db78f2c28eb7bf7eab2313acb185a2f84b Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 19 Mar 2014 02:04:18 +0000 Subject: [PATCH] zuul.gerrit.Gerrit.isMerged should not return None * zuul/trigger/gerrit.py(Gerrit.isMerged): Make sure to return False if we fell through all the conditionals, rather than defaulting to None. This should have no current impact since all comparisons to the returned value elsewhere are boolean and not "is None" or similar. Change-Id: I05360833f1e5b35fbfb1894dadcb46e82ff78a11 --- zuul/trigger/gerrit.py | 1 + 1 file changed, 1 insertion(+) diff --git a/zuul/trigger/gerrit.py b/zuul/trigger/gerrit.py index f15d8bf514..dc66f9774a 100644 --- a/zuul/trigger/gerrit.py +++ b/zuul/trigger/gerrit.py @@ -238,6 +238,7 @@ class Gerrit(object): self.log.debug("Change %s status: %s" % (change, status)) if status == 'MERGED': return True + return False def canMerge(self, change, allow_needs): if not change.number: