From 8984e733c929a64538a2809998ed2d36c7e5a8b1 Mon Sep 17 00:00:00 2001 From: Dmitrijs Ledkovs Date: Sat, 24 Apr 2010 00:54:11 +0100 Subject: [PATCH] Fixed reference to git module name when using dvcs_mirror_dir Previously it assumed module href does not end with ".git" so if module href is git://example.com/foo.git it would check for $dvcs_mirror_dir/foo.git.git, think mirror doesn't exists and try to create it: git clone --mirror git://example.com/foo.git fatal: destination path 'foo.git' already exists and is not an empty directory. --- jhbuild/versioncontrol/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jhbuild/versioncontrol/git.py b/jhbuild/versioncontrol/git.py index cb6d818f..68354f94 100644 --- a/jhbuild/versioncontrol/git.py +++ b/jhbuild/versioncontrol/git.py @@ -213,7 +213,7 @@ class GitBranch(Branch): return mirror_dir = os.path.join(self.config.dvcs_mirror_dir, - os.path.basename(self.module) + '.git') + self.get_module_basename() + '.git') if os.path.exists(mirror_dir): buildscript.execute(['git', 'fetch'], cwd=mirror_dir, -- 2.11.4.GIT