From c79b7f06af33f0b4531455aab25b6af646d29284 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Aug 2014 13:56:25 +0100 Subject: 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 (Bitbake rev: 303e6256947f4df4f283b75b7ccfdffa72864d67) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/hg.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bitbake/lib') 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): else: cmd = "%s pull" % (basecmd) elif command == "update": - 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)) + 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\" update -C %s" % (basecmd, ud.user, ud.pswd, proto, " ".join(options)) + else: + cmd = "%s update -C %s" % (basecmd, " ".join(options)) else: raise FetchError("Invalid hg command %s" % command, ud.url) -- cgit v1.2.3-54-g00ecf