diff options
| author |   Volker Vogelhuber <v.vogelhuber@digitalendoscopy.de> | 2013-11-01 17:53:09 +0000 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-12-03 17:12:20 +0000 |
| commit | f1e82236c2d30897bb863fb8948dd48614fc262a (patch) | |
| tree | 05414cd03738ea0564b4246494f8a3ce1e811f8c | |
| parent | 91e3735c2e73094b49f99b01008bb5bf47dacf04 (diff) | |
| download | bitbake-f1e82236c2d30897bb863fb8948dd48614fc262a.tar.gz | |
fetch/hg: Improve user/password handling
Trying to use a server with username and password authentication
within the URL of the SRC_URI variable doesn't appear to work.
This patch adds the missing parts to the hg fetcher to make this
work properly.
(Bitbake master rev: dc3d6d73e44802c203b3f7247f6f212acc2f69bf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/hg.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/bb/fetch2/hg.py b/lib/bb/fetch2/hg.py index b1c8675dd..cf214816b 100644 --- a/lib/bb/fetch2/hg.py +++ b/lib/bb/fetch2/hg.py @@ -92,7 +92,10 @@ class Hg(FetchMethod): if not ud.user: hgroot = host + ud.path else: - hgroot = ud.user + "@" + host + ud.path + if ud.pswd: + hgroot = ud.user + ":" + ud.pswd + "@" + host + ud.path + else: + hgroot = ud.user + "@" + host + ud.path if command == "info": return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module) @@ -112,7 +115,10 @@ class Hg(FetchMethod): # do not pass options list; limiting pull to rev causes the local # repo not to contain it and immediately following "update" command # will crash - cmd = "%s pull" % (basecmd) + if ud.user and ud.pswd: + cmd = "%s --config auth.default.prefix=* --config auth.default.username=%s --config auth.default.password=%s --config \"auth.default.schemes=%s\" pull" % (basecmd, ud.user, ud.pswd, proto) + else: + cmd = "%s pull" % (basecmd) elif command == "update": cmd = "%s update -C %s" % (basecmd, " ".join(options)) else: |