From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 7 Jan 2016 13:18:52 +0000 (+0000)
Subject: fetch/git: Change to use clearer ssh url syntax for broken servers
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4193e99adce8e88f12ac88d7578ad39575f7e346;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 5ffab220569..10ba1d3a610 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):