From e9b40b0f19f57a31894bb5fbfaeb082835f46651 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Thu, 27 Oct 2016 10:22:54 +0200 Subject: [PATCH] pr: Move log statement to allow early return and still log merge response. --- rhodecode/model/pull_request.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index f08b8b36..10395a8e 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -924,6 +924,7 @@ class PullRequestModel(BaseModel): try: resp = self._try_merge(pull_request) + log.debug("Merge response: %s", resp) status = resp.possible, self.merge_status_message( resp.failure_reason) except NotImplementedError: @@ -983,7 +984,7 @@ class PullRequestModel(BaseModel): _last_merge_status == MergeFailureReason.NONE merge_state = MergeResponse( possible, False, None, pull_request._last_merge_status) - log.debug("Merge response: %s", merge_state) + return merge_state def _refresh_reference(self, reference, vcs_repository):