MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/oe/distro_check: Remove '_proxy' on dict values used by urllib.open

Browse Source 
There are two ways to pass the proxies values into urllib.open: exporting
the environment variables *_proxy and passing as dictionary into the
urllib.open call. The latter is currenty used and values should not have
the '_proxy' string, so removing it. Also, ignore uppercase proxies, these
are not taken into account by the library.

Tested on a network with proxy, adding 'inherit +="distrodata"' on local.conf
with the following commands

    for distrotask in distrodataall distro_checkall checklicenseall; do
        bitbake universe -c $distrotask
    done

[YOCTO #7567]

(From OE-Core rev: 92fb327b08e4f9cfb2400610c2983afe579b3592)

Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@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:
Leonardo Sandoval 2015-10-08 09:11:55 +00:00 committed by Richard Purdie
parent 4bf7b7dd84
commit f385ed1a06
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/lib/oe/distro_check.py
View File

@ -10,13 +10,8 @@ def create_socket(url, d):
def get_proxies(d):
import os
proxykeys = ['HTTP_PROXY', 'http_proxy',
'HTTPS_PROXY', 'https_proxy',
'FTP_PROXY', 'ftp_proxy',
'FTPS_PROXY', 'ftps_proxy',
'NO_PROXY', 'no_proxy',
'ALL_PROXY', 'all_proxy']
proxyvalues = map(lambda key: d.getVar(key, True), proxykeys)
proxykeys = ['http', 'https', 'ftp', 'ftps', 'no', 'all']
proxyvalues = map(lambda key: d.getVar(key+'_proxy', True), proxykeys)
return dict(zip(proxykeys, proxyvalues))
def get_links_from_url(url, d):