accept_merge_request: refactoring

• Combine two return statements into one.
• Switch if statement order to remove else branch.

accept_merge_request.py

@@ -44,10 +44,9 @@ def accept_merge_request(project, mr, rebase=False):
             else:
                 if mr.merge_error:
                     print("Merge error: %s" % mr.merge_error)
-                    return False
                 else:
                     print("Merge reported success, but MR state is '%s'" % mr.state)
-                    return False
+                return False
 
         except GitlabMRClosedError as e:
             # See HTTP error codes for merge requests here:
@@ -80,15 +79,14 @@ def accept_merge_request(project, mr, rebase=False):
                     print("")
                     pipeline_pending = False
                 print("Merge not possible, but branch can be automatically rebased")
-                if rebase:
-                    print("Trying to rebase...")
-                    mr = common.rebase_merge_request(project, mr)
-                    if mr.merge_error:
-                        print("ERROR: rebase not possible\n'%s'" % mr.merge_error)
-                        sys.exit(critical_error)
-                    print("Sucessfully rebased")
-                else:
+                if not rebase:
                     return False
+                print("Trying to rebase...")
+                mr = common.rebase_merge_request(project, mr)
+                if mr.merge_error:
+                    print("ERROR: rebase not possible\n'%s'" % mr.merge_error)
+                    sys.exit(critical_error)
+                print("Sucessfully rebased")
 
             else:
                 if pipeline_pending: