summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
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-03-31 10:08:36 +0100
commitf46846dc118a3132eee5aeddb43570b8343afc0a (patch)
treecfea640dacfcc73ad20aa052f861049426870452 /bitbake/lib/bb/fetch2
parent03b4226242e1fdff2021f562b27430bc12575087 (diff)
downloadpoky-f46846dc118a3132eee5aeddb43570b8343afc0a.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: 6a917ec99d659e684b15fa8af94c325172676062) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-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 0c61dfa20d..ae0ffa8c97 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -107,9 +107,8 @@ class Wget(FetchMethod):
107 bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile)) 107 bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile))
108 fetchcmd += " -O " + dldir + os.sep + ud.localfile 108 fetchcmd += " -O " + dldir + os.sep + ud.localfile
109 109
110 if ud.user: 110 if ud.user and ud.pswd:
111 up = ud.user.split(":") 111 fetchcmd += " --user=%s --password=%s --auth-no-challenge" % (ud.user, ud.pswd)
112 fetchcmd += " --user=%s --password=%s --auth-no-challenge" % (up[0],up[1])
113 112
114 uri = ud.url.split(";")[0] 113 uri = ud.url.split(";")[0]
115 if os.path.exists(ud.localpath): 114 if os.path.exists(ud.localpath):