[PATCH] remote-bzr: update old organization
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
If a clone exists with the old organization (v1.8.2) it will prevent the new shared repository organization from working, so let's remove this repository, which is not used any more. Signed-off-by: Felipe Contreras <redacted> --- contrib/remote-helpers/git-remote-bzr | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 3e452af..b295dd4 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr@@ -830,6 +830,13 @@ def get_repo(url, alias): clone_path = os.path.join(dirname, 'clone') if not os.path.exists(clone_path): os.mkdir(clone_path) + else: + # check and remove old organization + try: + bdir = bzrlib.bzrdir.BzrDir.open(clone_path) + bdir.destroy_repository() + except bzrlib.errors.NotBranchError: + pass try: repo = origin.open_repository()
--
1.8.3.rc1.579.g184e698