From: Richard Purdie Date: Tue, 4 Nov 2008 21:11:58 +0000 (+0000) Subject: bitbake wget.py: Fix problem with empty proxy variables X-Git-Tag: 2011-1~7851^2~4 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=510d5d7f4d0fab6af6f924de92f8db21c42b3f52;p=openembedded-core.git bitbake wget.py: Fix problem with empty proxy variables --- diff --git a/bitbake-dev/lib/bb/fetch/wget.py b/bitbake-dev/lib/bb/fetch/wget.py index 75357d539b..0008a28700 100644 --- a/bitbake-dev/lib/bb/fetch/wget.py +++ b/bitbake-dev/lib/bb/fetch/wget.py @@ -72,14 +72,14 @@ class Wget(Fetch): ftpproxy = None if uri_type == 'http': httpproxy = data.getVar("HTTP_PROXY", d, True) - httpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split() + httpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split() for p in httpproxy_ignore: if uri_host.endswith(p): httpproxy = None break if uri_type == 'ftp': ftpproxy = data.getVar("FTP_PROXY", d, True) - ftpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split() + ftpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split() for p in ftpproxy_ignore: if uri_host.endswith(p): ftpproxy = None diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py index 75357d539b..0008a28700 100644 --- a/bitbake/lib/bb/fetch/wget.py +++ b/bitbake/lib/bb/fetch/wget.py @@ -72,14 +72,14 @@ class Wget(Fetch): ftpproxy = None if uri_type == 'http': httpproxy = data.getVar("HTTP_PROXY", d, True) - httpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split() + httpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split() for p in httpproxy_ignore: if uri_host.endswith(p): httpproxy = None break if uri_type == 'ftp': ftpproxy = data.getVar("FTP_PROXY", d, True) - ftpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split() + ftpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split() for p in ftpproxy_ignore: if uri_host.endswith(p): ftpproxy = None