bitbake: bb/fetch2: Move export_proxies function from wget to utils.
In order to use in other modules since is a common function when needs to get proxies working. (Bitbake rev: 85c529044381895556d603a3974de22392646a22) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7226ce2830
commit
d0d85a4d6b
|
@ -37,6 +37,7 @@ from bb.fetch2 import FetchMethod
|
||||||
from bb.fetch2 import FetchError
|
from bb.fetch2 import FetchError
|
||||||
from bb.fetch2 import logger
|
from bb.fetch2 import logger
|
||||||
from bb.fetch2 import runfetchcmd
|
from bb.fetch2 import runfetchcmd
|
||||||
|
from bb.utils import export_proxies
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
from bs4 import SoupStrainer
|
from bs4 import SoupStrainer
|
||||||
|
|
||||||
|
@ -219,22 +220,6 @@ class Wget(FetchMethod):
|
||||||
|
|
||||||
return resp
|
return resp
|
||||||
|
|
||||||
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 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
|
|
||||||
|
|
||||||
class HTTPMethodFallback(urllib2.BaseHandler):
|
class HTTPMethodFallback(urllib2.BaseHandler):
|
||||||
"""
|
"""
|
||||||
Fallback to GET if HEAD is not allowed (405 HTTP error)
|
Fallback to GET if HEAD is not allowed (405 HTTP error)
|
||||||
|
|
|
@ -1406,3 +1406,22 @@ def set_process_name(name):
|
||||||
libc.prctl(15, byref(buff), 0, 0, 0)
|
libc.prctl(15, byref(buff), 0, 0, 0)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
# export common proxies variables from datastore to environment
|
||||||
|
def export_proxies(d):
|
||||||
|
import os
|
||||||
|
|
||||||
|
variables = ['http_proxy', 'HTTP_PROXY', 'https_proxy', 'HTTPS_PROXY',
|
||||||
|
'ftp_proxy', 'FTP_PROXY', 'no_proxy', 'NO_PROXY']
|
||||||
|
exported = False
|
||||||
|
|
||||||
|
for v in variables:
|
||||||
|
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
|
||||||
|
|
Loading…
Reference in New Issue