aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:18:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:53:04 +0000
commit4193e99adce8e88f12ac88d7578ad39575f7e346 (patch)
tree88f6048cb688316d732600e46a5e5ac6be2a97f0
parent6f84cf4bd77f35fcd07e0b2f5149f1d6866a414d (diff)
downloadbitbake-4193e99adce8e88f12ac88d7578ad39575f7e346.tar.gz
fetch/git: Change to use clearer ssh url syntax for broken servers
Some servers, e.g. bitbucket.org can't cope with ssh:// as part of the git url syntax. git itself is happy enough with this but you get server side errors when using it. This changes the git fetcher to use the more common ssh url format which also means we need a : before the path. Seems a shame to have to do this due to broken servers however it should be safe enough since this other form is the one most people use on the commandline so it should be safe enough. [YOCTO #8864] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/fetch2/git.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 5ffab2205..10ba1d3a6 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -330,6 +330,10 @@ class Git(FetchMethod):
username = ud.user + '@'
else:
username = ""
+ if ud.proto == "ssh":
+ # Some servers, e.g. bitbucket.org can't cope with ssh://
+ # and removing that means we need a : before path.
+ return "%s%s:%s" % (username, ud.host, ud.path)
return "%s://%s%s%s" % (ud.proto, username, ud.host, ud.path)
def _revision_key(self, ud, d, name):