diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2014-02-09 12:39:30 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:56:22 +0000 |
| commit | 97e263b99cbe8184a74f80738fd471cfdef29e0c (patch) | |
| tree | 7503e4f5dcb10ce73ca1fdb45143c835e98ebf17 /meta/lib/oeqa/utils | |
| parent | 9b75f6a5786ff7b2e6219d78b38f0032f100c660 (diff) | |
| download | openembedded-core-97e263b99cbe8184a74f80738fd471cfdef29e0c.tar.gz openembedded-core-97e263b99cbe8184a74f80738fd471cfdef29e0c.tar.bz2 openembedded-core-97e263b99cbe8184a74f80738fd471cfdef29e0c.zip | |
oeqa/utils: targetbuild: take proxy into account
A previous commit broke downloads
when proxies are involved, let's fix it.
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils')
| -rw-r--r-- | meta/lib/oeqa/utils/targetbuild.py | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/targetbuild.py b/meta/lib/oeqa/utils/targetbuild.py index 77181b1c3d..32296762c0 100644 --- a/meta/lib/oeqa/utils/targetbuild.py +++ b/meta/lib/oeqa/utils/targetbuild.py @@ -11,8 +11,9 @@ import subprocess class TargetBuildProject(): - def __init__(self, target, uri, foldername=None): + def __init__(self, target, d, uri, foldername=None): self.target = target + self.d = d self.uri = uri self.targetdir = "~/" self.archive = os.path.basename(uri) @@ -23,7 +24,22 @@ class TargetBuildProject(): def download_archive(self): - subprocess.check_call("wget -O %s %s" % (self.localarchive, self.uri), shell=True) + exportvars = ['HTTP_PROXY', 'http_proxy', + 'HTTPS_PROXY', 'https_proxy', + 'FTP_PROXY', 'ftp_proxy', + 'FTPS_PROXY', 'ftps_proxy', + 'NO_PROXY', 'no_proxy', + 'ALL_PROXY', 'all_proxy', + 'SOCKS5_USER', 'SOCKS5_PASSWD'] + + cmd = '' + for var in exportvars: + val = self.d.getVar(var, True) + if val: + cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd) + + cmd = cmd + "wget -O %s %s" % (self.localarchive, self.uri) + subprocess.check_call(cmd, shell=True) (status, output) = self.target.copy_to(self.localarchive, self.targetdir) if status != 0: |