From 8a55407f87406a55c4168c28952cc20f2486b856 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 20 Sep 2018 16:11:43 +0200 Subject: [PATCH] [FIX] runbot_merge: like PRs, review bodies are null if left empty --- runbot_merge/controllers/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runbot_merge/controllers/__init__.py b/runbot_merge/controllers/__init__.py index ef4a9b84..1baaf551 100644 --- a/runbot_merge/controllers/__init__.py +++ b/runbot_merge/controllers/__init__.py @@ -251,11 +251,12 @@ def handle_review(env, event): firstline = '' state = event['review']['state'].lower() if state == 'approved': - firstline = pr.repository.project_id.github_prefix + ' r+\n' + firstline = pr.repository.project_id.github_prefix + ' r+' elif state == 'request_changes': - firstline = pr.repository.project_id.github_prefix + ' r-\n' + firstline = pr.repository.project_id.github_prefix + ' r-' - return pr._parse_commands(partner, firstline + event['review']['body']) + body = event['review']['body'] + return pr._parse_commands(partner, firstline + ('\n' + body) if body else '') def handle_ping(env, event): print("Got ping! {}".format(event['zen']))