yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ReviewBot: check_one_request(): correct logic to return "lowest" result.

Browse Source 
Without this change if two actions return True and None, True is returned
which is not desirable.
This commit is contained in:
Jimmy Berry 2018-08-08 23:26:10 -05:00
parent 9a1fd7fb7b
commit 7c35c5d03e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ReviewBot.py
View File

@ -330,7 +330,7 @@ class ReviewBot(object):
if self.comment_handler is not False: if self.comment_handler is not False:
self.comment_handler_add() self.comment_handler_add()
overall = None overall = True
for a in req.actions: for a in req.actions:
# Store in-case sub-classes need direct access to original values. # Store in-case sub-classes need direct access to original values.
self.action = a self.action = a
@ -340,8 +340,14 @@ class ReviewBot(object):
fn = 'check_action__default' fn = 'check_action__default'
func = getattr(self, fn) func = getattr(self, fn)
ret = func(req, a) ret = func(req, a)
if ret == False or overall is None and ret is not None:
overall = ret # In the case of multiple actions take the "lowest" result where the
# order from lowest to highest is: False, None, True.
if overall is not False:
if ((overall is True and ret is not True) or
(overall is None and ret is False)):
overall = ret
return overall return overall
@staticmethod @staticmethod