[bitbake-devel] [PATCHv3 5/6] fetch2/wget.py: checkstatus fix using proxy handler
Aníbal Limón
anibal.limon at linux.intel.com
Tue Jun 30 14:39:14 UTC 2015
From: Aníbal Limón <limon.anibal at gmail.com>
Only use ProxyHandler opener when exists proxies in env.
Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
---
lib/bb/fetch2/wget.py | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py
index 8cb5f2b..7e90efb 100644
--- a/lib/bb/fetch2/wget.py
+++ b/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]
--
1.9.1
More information about the bitbake-devel
mailing list