[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3856/8267] bitbake: fetch2/wget: fixup case with no useful netrc data



commit d41d2fdd5648f6fe7103ef9e0869c97e8d04552f
Author: Mark Asselstine <mark asselstine windriver com>
Date:   Tue Dec 20 21:50:01 2016 -0500

    bitbake: fetch2/wget: fixup case with no useful netrc data
    
    Commit 873e33d0479e977520106b65d149ff1799195bf6 [fetch2/wget:
    add Basic Auth from netrc to checkstatus()] causes "Fetcher failure
    for URL: 'https://www.example.com/'. URL https://www.example.com/
    doesn't work." on new builds when a user has a .netrc file but there
    is no default and no matching host. The call to netrc.authenticators()
    will return None in these cases and the attempted assignment to the
    3-tuple will raise a TypeError exception. Add the TypeError to the
    exceptions caught to get around this issue.
    
    (Bitbake rev: c0c0af40ebddaf9dc99353c580a65d4c04295613)
    
    Signed-off-by: Mark Asselstine <mark asselstine windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/wget.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 88349c9..737b98d 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -320,7 +320,7 @@ class Wget(FetchMethod):
                 n = netrc.netrc()
                 login, unused, password = n.authenticators(urllib.parse.urlparse(uri).hostname)
                 add_basic_auth("%s:%s" % (login, password), r)
-            except (ImportError, IOError, netrc.NetrcParseError):
+            except (TypeError, ImportError, IOError, netrc.NetrcParseError):
                  pass
 
             opener.open(r)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]