summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2016-12-20 21:50:01 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-21 08:16:53 +0000
commitc0c0af40ebddaf9dc99353c580a65d4c04295613 (patch)
tree5b0eb673e4441b47a6c3b9fa8497032a049b92b1
parent873e33d0479e977520106b65d149ff1799195bf6 (diff)
downloadbitbake-contrib-c0c0af40ebddaf9dc99353c580a65d4c04295613.tar.gz
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. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/fetch2/wget.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py
index 88349c9bf..737b98dd0 100644
--- a/lib/bb/fetch2/wget.py
+++ b/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)