summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-30 11:42:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 15:12:43 +0100
commit88ad6d975e5965b54b97fced8323a55c39d8a9f1 (patch)
tree21acdbc845cebd63ce7ab1f3c985df0a586ed794
parent7d5822bf4cb2089687c3c9a908cf4a4ef4e9a53a (diff)
downloadpoky-88ad6d975e5965b54b97fced8323a55c39d8a9f1.tar.gz
bitbake: wget: Fix handling of urls with user/password
URL decoding was improved in the core a while ago and this looks like a leftover from those times which caused urls needing a user/password to fail. Use the parameters from the core instead of the broken split implementation. [YOCTO #11262] (Bitbake rev: 32a249cf33f79b579a2cf6224c7d23cdb20d376f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/wget.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index ecb946aa81..23d48acb07 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -108,9 +108,8 @@ class Wget(FetchMethod):
108 bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile)) 108 bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile))
109 fetchcmd += " -O " + dldir + os.sep + ud.localfile 109 fetchcmd += " -O " + dldir + os.sep + ud.localfile
110 110
111 if ud.user: 111 if ud.user and ud.pswd:
112 up = ud.user.split(":") 112 fetchcmd += " --user=%s --password=%s --auth-no-challenge" % (ud.user, ud.pswd)
113 fetchcmd += " --user=%s --password=%s --auth-no-challenge" % (up[0],up[1])
114 113
115 uri = ud.url.split(";")[0] 114 uri = ud.url.split(";")[0]
116 if os.path.exists(ud.localpath): 115 if os.path.exists(ud.localpath):