diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-27 13:56:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-28 15:12:45 +0100 |
commit | c79b7f06af33f0b4531455aab25b6af646d29284 (patch) | |
tree | d0835bc2e310d8ccb492f247732be0f261f50436 /bitbake/lib | |
parent | d1a133a6705d3bad97cf7b9e26441970d24ed97e (diff) | |
download | poky-c79b7f06af33f0b4531455aab25b6af646d29284.tar.gz |
bitbake: fetch2/hg: Fix username/password handling
We should only add user/password options if they're specified as in the
fetch case. Patch from Volker Vogelhuber <v.vogelhuber@digitalendoscopy.de>
(Bitbake rev: 303e6256947f4df4f283b75b7ccfdffa72864d67)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/fetch2/hg.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py index 5760fcdc58..81592f6e04 100644 --- a/bitbake/lib/bb/fetch2/hg.py +++ b/bitbake/lib/bb/fetch2/hg.py | |||
@@ -123,7 +123,10 @@ class Hg(FetchMethod): | |||
123 | else: | 123 | else: |
124 | cmd = "%s pull" % (basecmd) | 124 | cmd = "%s pull" % (basecmd) |
125 | elif command == "update": | 125 | elif command == "update": |
126 | cmd = "%s update --config auth.default.prefix=* --config auth.default.username=%s --config auth.default.password=%s --config \"auth.default.schemes=%s\" -C %s" % (basecmd, ud.user, ud.pswd, proto, " ".join(options)) | 126 | if ud.user and ud.pswd: |
127 | cmd = "%s --config auth.default.prefix=* --config auth.default.username=%s --config auth.default.password=%s --config \"auth.default.schemes=%s\" update -C %s" % (basecmd, ud.user, ud.pswd, proto, " ".join(options)) | ||
128 | else: | ||
129 | cmd = "%s update -C %s" % (basecmd, " ".join(options)) | ||
127 | else: | 130 | else: |
128 | raise FetchError("Invalid hg command %s" % command, ud.url) | 131 | raise FetchError("Invalid hg command %s" % command, ud.url) |
129 | 132 | ||