[PATCH] bitbake: fetch2/wget: fixup case with no netrc data

[PATCH] bitbake: fetch2/wget: fixup case with no netrc data

[Mark Asselstine]

Commit 873e33d0479e977520106b65d149ff1799195bf6 [bitbake: 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>
---
 lib/bb/fetch2/wget.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py
index 88349c9..737b98d 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)
-- 
2.7.4

Re: [PATCH] bitbake: fetch2/wget: fixup case with no netrc data

[Mark Asselstine]

Sorry, I just noticed I left the 'bitbake:' prefix on the short log as I 
originally prepared this commit in poky. I will send a V2 with this dropped. 
Sorry for the noise.

Mark


On Tuesday, December 20, 2016 9:41:20 PM EST Mark Asselstine wrote:
> Commit 873e33d0479e977520106b65d149ff1799195bf6 [bitbake: 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>
> ---
>  lib/bb/fetch2/wget.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py
> index 88349c9..737b98d 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)