diff options
author | Aníbal Limón <limon.anibal@gmail.com> | 2015-07-08 18:34:19 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-12 22:50:43 +0100 |
commit | 804f1a2312f85125c83e2dae2af69abdd7ef7681 (patch) | |
tree | 5727bc1f3ac853858502ccae51dc3c4f7fa73aa8 /bitbake/lib/bb/fetch2 | |
parent | 913631c4666ea3e7a5484ad8340fca44c015c390 (diff) | |
download | openembedded-core-contrib-804f1a2312f85125c83e2dae2af69abdd7ef7681.tar.gz |
bitbake: fetch2/wget.py: checkstatus fix using proxy handler
Only use ProxyHandler opener when exists proxies in env.
(Bitbake rev: 0f062c5d99e12ce20c0e46a8e602448032144ff6)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r-- | bitbake/lib/bb/fetch2/wget.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 8cb5f2be81..7e90efb4df 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -221,17 +221,29 @@ class Wget(FetchMethod): def export_proxies(d): variables = ['http_proxy', 'HTTP_PROXY', 'https_proxy', 'HTTPS_PROXY', 'ftp_proxy', 'FTP_PROXY', 'no_proxy', 'NO_PROXY'] + exported = False for v in variables: - if not v in os.environ.keys(): - os.environ[v] = d.getVar(v, True) or '' + if v in os.environ.keys(): + exported = True + else: + v_proxy = d.getVar(v, True) + if v_proxy is not None: + os.environ[v] = v_proxy + exported = True + + return exported def head_method(self): return "HEAD" - export_proxies(d) + exported_proxies = export_proxies(d) + if exported_proxies == True: + opener = urllib2.build_opener(urllib2.ProxyHandler, CacheHTTPHandler) + else: + opener = urllib2.build_opener(CacheHTTPHandler) + urllib2.Request.get_method = head_method - opener = urllib2.build_opener(urllib2.ProxyHandler, CacheHTTPHandler) urllib2.install_opener(opener) uri = ud.url.split(";")[0] |