diff --git a/pagure/api/fork.py b/pagure/api/fork.py index 6fe6569..559d818 100644 --- a/pagure/api/fork.py +++ b/pagure/api/fork.py @@ -364,19 +364,15 @@ def api_pull_request_merge(repo, requestid, username=None, namespace=None): if threshold > 0 and int(request.score) < int(threshold): raise pagure.exceptions.APIError(403, error_code=APIERROR.EPRSCORE) - try: - task = pagure.lib.tasks.merge_pull_request.delay( - repo.name, namespace, username, requestid, - flask.g.fas_user.username) - output = {'message': 'Merging queued', - 'taskid': task.id} - - if get_request_data().get('wait', True): - task.get() - output = {'message': 'Changes merged!'} - except pagure.exceptions.PagureException as err: - raise pagure.exceptions.APIError( - 400, error_code=APIERROR.ENOCODE, error=str(err)) + task = pagure.lib.tasks.merge_pull_request.delay( + repo.name, namespace, username, requestid, + flask.g.fas_user.username) + output = {'message': 'Merging queued', + 'taskid': task.id} + + if get_request_data().get('wait', True): + task.get() + output = {'message': 'Changes merged!'} jsonout = flask.jsonify(output) return jsonout