[Pkg-mozext-commits] [adblock-plus] 39/52: Issue 1808 - ensure_dependencies.py generates wrong repository path for local roots

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 96b22c9c1c6047aa5aa7a1b547c65252275bcbbb
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Jan 14 22:23:28 2015 +0100

    Issue 1808 - ensure_dependencies.py generates wrong repository path for local roots
---
 ensure_dependencies.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ensure_dependencies.py b/ensure_dependencies.py
index 21a237d..d8af9e7 100755
--- a/ensure_dependencies.py
+++ b/ensure_dependencies.py
@@ -187,7 +187,11 @@ def ensure_repo(parentrepo, target, roots, sourcename):
   if type is None:
     raise Exception("No valid source found to create %s" % target)
 
-  url = urlparse.urljoin(roots[type], sourcename)
+  if os.path.exists(roots[type]):
+    url = os.path.join(roots[type], sourcename)
+  else:
+    url = urlparse.urljoin(roots[type], sourcename)
+
   logging.info("Cloning repository %s into %s" % (url, target))
   repo_types[type].clone(url, target)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git