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]

Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py
index b3419ce03a96cf73a518008cbf61641211f1f6e2..f92cd2e42312cd423e7c8ae6ac81df45a4be5184 100644 (file)
--- a/meta/lib/oe/distro_check.py
+++ b/meta/lib/oe/distro_check.py
@@ -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):