[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5383/8267] bitbake: wget: Fix handling of urls with user/password

[Emmanuele Bassi <ebassi src gnome org>]

commit f46846dc118a3132eee5aeddb43570b8343afc0a
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Thu Mar 30 11:42:59 2017 +0100

    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>

 bitbake/lib/bb/fetch2/wget.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 0c61dfa..ae0ffa8 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -107,9 +107,8 @@ class Wget(FetchMethod):
             bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile))
             fetchcmd += " -O " + dldir + os.sep + ud.localfile
 
-        if ud.user:
-            up = ud.user.split(":")
-            fetchcmd += " --user=%s --password=%s --auth-no-challenge" % (up[0],up[1])
+        if ud.user and ud.pswd:
+            fetchcmd += " --user=%s --password=%s --auth-no-challenge" % (ud.user, ud.pswd)
 
         uri = ud.url.split(";")[0]
         if os.path.exists(ud.localpath):