diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-04 21:11:58 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-04 21:11:58 +0000 |
| commit | 510d5d7f4d0fab6af6f924de92f8db21c42b3f52 (patch) | |
| tree | 4e6f8e6eee5ef871ab93a046998dbb9545af6f7d | |
| parent | 973bba1edee9211270ec150c8b635563a9f50255 (diff) | |
| download | poky-510d5d7f4d0fab6af6f924de92f8db21c42b3f52.tar.gz | |
bitbake wget.py: Fix problem with empty proxy variables
| -rw-r--r-- | bitbake-dev/lib/bb/fetch/wget.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch/wget.py | 4 |
2 files changed, 4 insertions, 4 deletions
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): | |||
| 72 | ftpproxy = None | 72 | ftpproxy = None |
| 73 | if uri_type == 'http': | 73 | if uri_type == 'http': |
| 74 | httpproxy = data.getVar("HTTP_PROXY", d, True) | 74 | httpproxy = data.getVar("HTTP_PROXY", d, True) |
| 75 | httpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split() | 75 | httpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split() |
| 76 | for p in httpproxy_ignore: | 76 | for p in httpproxy_ignore: |
| 77 | if uri_host.endswith(p): | 77 | if uri_host.endswith(p): |
| 78 | httpproxy = None | 78 | httpproxy = None |
| 79 | break | 79 | break |
| 80 | if uri_type == 'ftp': | 80 | if uri_type == 'ftp': |
| 81 | ftpproxy = data.getVar("FTP_PROXY", d, True) | 81 | ftpproxy = data.getVar("FTP_PROXY", d, True) |
| 82 | ftpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split() | 82 | ftpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split() |
| 83 | for p in ftpproxy_ignore: | 83 | for p in ftpproxy_ignore: |
| 84 | if uri_host.endswith(p): | 84 | if uri_host.endswith(p): |
| 85 | ftpproxy = None | 85 | 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): | |||
| 72 | ftpproxy = None | 72 | ftpproxy = None |
| 73 | if uri_type == 'http': | 73 | if uri_type == 'http': |
| 74 | httpproxy = data.getVar("HTTP_PROXY", d, True) | 74 | httpproxy = data.getVar("HTTP_PROXY", d, True) |
| 75 | httpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split() | 75 | httpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split() |
| 76 | for p in httpproxy_ignore: | 76 | for p in httpproxy_ignore: |
| 77 | if uri_host.endswith(p): | 77 | if uri_host.endswith(p): |
| 78 | httpproxy = None | 78 | httpproxy = None |
| 79 | break | 79 | break |
| 80 | if uri_type == 'ftp': | 80 | if uri_type == 'ftp': |
| 81 | ftpproxy = data.getVar("FTP_PROXY", d, True) | 81 | ftpproxy = data.getVar("FTP_PROXY", d, True) |
| 82 | ftpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split() | 82 | ftpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split() |
| 83 | for p in ftpproxy_ignore: | 83 | for p in ftpproxy_ignore: |
| 84 | if uri_host.endswith(p): | 84 | if uri_host.endswith(p): |
| 85 | ftpproxy = None | 85 | ftpproxy = None |