[25/26] allura git commit: [#7830] ticket:733 Don't catch exception in merge task

[je...@apache.org]

[#7830] ticket:733 Don't catch exception in merge task

So that merge task will get 'error' status and proper message will be displayed
to the user.


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4e289266
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4e289266
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4e289266

Branch: refs/heads/ib/7830
Commit: 4e2892660a201327788aa299de8c7409f8eda4b0
Parents: 035f4f5
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Feb 26 13:16:23 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Feb 26 13:16:23 2015 +0000

----------------------------------------------------------------------
 Allura/allura/tasks/repo_tasks.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/4e289266/Allura/allura/tasks/repo_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/repo_tasks.py b/Allura/allura/tasks/repo_tasks.py
index e50f9d2..e873694 100644
--- a/Allura/allura/tasks/repo_tasks.py
+++ b/Allura/allura/tasks/repo_tasks.py
@@ -160,10 +160,6 @@ def merge(merge_request_id):
     from allura import model as M
     log = logging.getLogger(__name__)
     mr = M.MergeRequest.query.get(_id=merge_request_id)
-    try:
-        mr.app.repo.merge(mr)
-    except:
-        log.exception("Can't merge merge request %s", mr.url())
-        return
+    mr.app.repo.merge(mr)
     mr.status = 'merged'
     session(mr).flush(mr)