allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject git commit: [#7333] ticket:578 Don't delete Repository object when importing svn repo
Date Wed, 30 Apr 2014 15:39:54 GMT
Repository: allura
Updated Branches:
  refs/heads/master 068f66e0f -> 04305692f


[#7333] ticket:578 Don't delete Repository object when importing svn repo


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

Branch: refs/heads/master
Commit: 04305692f5bcc9709b575fc4603f0bbe025f6c8c
Parents: 068f66e
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Wed Apr 30 13:12:09 2014 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Wed Apr 30 13:12:09 2014 +0300

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


http://git-wip-us.apache.org/repos/asf/allura/blob/04305692/Allura/allura/tasks/repo_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/repo_tasks.py b/Allura/allura/tasks/repo_tasks.py
index fe476eb..61cac83 100644
--- a/Allura/allura/tasks/repo_tasks.py
+++ b/Allura/allura/tasks/repo_tasks.py
@@ -59,10 +59,9 @@ def reclone(*args, **kwargs):
     repo = c.app.repo
     if repo is not None:
         shutil.rmtree(repo.full_fs_path, ignore_errors=True)
-        repo.delete()
-    ThreadLocalORMSession.flush_all()
     M.MergeRequest.query.remove(dict(
         app_config_id=c.app.config._id))
+    ThreadLocalORMSession.flush_all()
     clone(*args, **kwargs)
 
 


Mime
View raw message