summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-17 12:07:41 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-17 12:07:41 +0000
commitee1f065078aaae3b0aadbf91cdc52184273d3f6b (patch)
tree8388bdd7605144f83ef010684248f09583170f70
parentf9dbbf4f83b835a8b696405535d5f1de7d6c53d9 (diff)
downloadopenembedded-core-ee1f065078aaae3b0aadbf91cdc52184273d3f6b.tar.gz
openembedded-core-ee1f065078aaae3b0aadbf91cdc52184273d3f6b.tar.bz2
openembedded-core-ee1f065078aaae3b0aadbf91cdc52184273d3f6b.zip
bitbake: Make sure the git remote head viewer preserves the username
-rw-r--r--bitbake-dev/lib/bb/fetch/git.py7
-rw-r--r--bitbake/lib/bb/fetch/git.py7
2 files changed, 12 insertions, 2 deletions
diff --git a/bitbake-dev/lib/bb/fetch/git.py b/bitbake-dev/lib/bb/fetch/git.py
index 26f2b47f2a..010a4f57a2 100644
--- a/bitbake-dev/lib/bb/fetch/git.py
+++ b/bitbake-dev/lib/bb/fetch/git.py
@@ -130,7 +130,12 @@ class Git(Fetch):
"""
Compute the HEAD revision for the url
"""
- output = runfetchcmd("git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d, True)
+ if ud.user:
+ username = ud.user + '@'
+ else:
+ username = ""
+
+ output = runfetchcmd("git ls-remote %s://%s%s%s %s" % (ud.proto, username, ud.host, ud.path, ud.branch), d, True)
return output.split()[0]
def _build_revision(self, url, ud, d):
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py
index 26f2b47f2a..010a4f57a2 100644
--- a/bitbake/lib/bb/fetch/git.py
+++ b/bitbake/lib/bb/fetch/git.py
@@ -130,7 +130,12 @@ class Git(Fetch):
"""
Compute the HEAD revision for the url
"""
- output = runfetchcmd("git ls-remote %s://%s%s %s" % (ud.proto, ud.host, ud.path, ud.branch), d, True)
+ if ud.user:
+ username = ud.user + '@'
+ else:
+ username = ""
+
+ output = runfetchcmd("git ls-remote %s://%s%s%s %s" % (ud.proto, username, ud.host, ud.path, ud.branch), d, True)
return output.split()[0]
def _build_revision(self, url, ud, d):