]> code.ossystems Code Review - openembedded-core.git/commitdiff
bitbake wget.py: Fix problem with empty proxy variables
authorRichard Purdie <rpurdie@linux.intel.com>
Tue, 4 Nov 2008 21:11:58 +0000 (21:11 +0000)
committerRichard Purdie <rpurdie@linux.intel.com>
Tue, 4 Nov 2008 21:11:58 +0000 (21:11 +0000)
bitbake-dev/lib/bb/fetch/wget.py
bitbake/lib/bb/fetch/wget.py

index 75357d539bbfe786d9e1091e7b137e99839e71f0..0008a28700ea7d8713d481b87f05f778d97e3105 100644 (file)
@@ -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
index 75357d539bbfe786d9e1091e7b137e99839e71f0..0008a28700ea7d8713d481b87f05f778d97e3105 100644 (file)
@@ -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