From c9f9b3050b5298d841ea05993b8d35f1216b547a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 7 May 2019 12:53:55 +0200 Subject: [PATCH] [FIX] runbot_merge: possibly missing commit object in try_splitting Would trigger a TypeError when trying to json.loads(False). --- runbot_merge/models/pull_requests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index 0ae17a5a..0b87a899 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -1278,7 +1278,7 @@ class Stagings(models.Model): commit = self.env['runbot_merge.commit'].search([ ('sha', '=', head) ]) - statuses = json.loads(commit.statuses) + statuses = json.loads(commit.statuses or '{}') reason = next(( ctx for ctx, result in statuses.items() if to_status(result).get('state') in ('error', 'failure')