sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Aníbal Limón 2015-07-08 18:34:19 -05:00 committed by Richard Purdie
parent 913631c466
commit 804f1a2312
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bitbake/lib/bb/fetch2/wget.py
View File

@ -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]