summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2015-10-08 09:11:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-12 14:36:30 +0100
commitf385ed1a066007567fcd62f72e7d71b3b84be12f (patch)
tree59ed77e892438daff1679badff05c8c28ef4431c /meta/lib
parent4bf7b7dd84dcf437d6d31005d7a04dab74aaf58b (diff)
downloadpoky-f385ed1a066007567fcd62f72e7d71b3b84be12f.tar.gz
lib/oe/distro_check: Remove '_proxy' on dict values used by urllib.open
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>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/distro_check.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py
index b3419ce03a..f92cd2e423 100644
--- a/meta/lib/oe/distro_check.py
+++ b/meta/lib/oe/distro_check.py
@@ -10,13 +10,8 @@ def create_socket(url, d):
10 10
11def get_proxies(d): 11def get_proxies(d):
12 import os 12 import os
13 proxykeys = ['HTTP_PROXY', 'http_proxy', 13 proxykeys = ['http', 'https', 'ftp', 'ftps', 'no', 'all']
14 'HTTPS_PROXY', 'https_proxy', 14 proxyvalues = map(lambda key: d.getVar(key+'_proxy', True), proxykeys)
15 'FTP_PROXY', 'ftp_proxy',
16 'FTPS_PROXY', 'ftps_proxy',
17 'NO_PROXY', 'no_proxy',
18 'ALL_PROXY', 'all_proxy']
19 proxyvalues = map(lambda key: d.getVar(key, True), proxykeys)
20 return dict(zip(proxykeys, proxyvalues)) 15 return dict(zip(proxykeys, proxyvalues))
21 16
22def get_links_from_url(url, d): 17def get_links_from_url(url, d):