allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/7] allura git commit: [#7830] ticket:733 Don't catch exception in merge task
Date Fri, 20 Mar 2015 20:41:54 GMT
Repository: allura
Updated Branches:
  refs/heads/master 9c06caf76 -> e146bbe89


[#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/0efaa304
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0efaa304
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0efaa304

Branch: refs/heads/master
Commit: 0efaa304c5ffd5e31086d92c4272bbae950b4fec
Parents: 02a3fca
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu Feb 26 13:16:23 2015 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Mar 20 20:40:29 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/0efaa304/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)


Mime
View raw message