diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-10-22 22:24:03 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-10-22 22:24:03 +0100 |
| commit | ede20a32458a01fbc3da95c82447b49fb2b25a94 (patch) | |
| tree | 20d50c2963e870e808fb746a4d91256d5c3cbee5 /bitbake/lib/bb/fetch/wget.py | |
| parent | 4329a29db5666adc95388c2cc2ebfacb07a81637 (diff) | |
| download | poky-ede20a32458a01fbc3da95c82447b49fb2b25a94.tar.gz | |
bitbake: Improve proxy variable handling in fetchers
Diffstat (limited to 'bitbake/lib/bb/fetch/wget.py')
| -rw-r--r-- | bitbake/lib/bb/fetch/wget.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py index 739d5a1bc6..c125ecb59b 100644 --- a/bitbake/lib/bb/fetch/wget.py +++ b/bitbake/lib/bb/fetch/wget.py | |||
| @@ -63,7 +63,14 @@ class Wget(Fetch): | |||
| 63 | bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri) | 63 | bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri) |
| 64 | fetchcmd = fetchcmd.replace("${URI}", uri) | 64 | fetchcmd = fetchcmd.replace("${URI}", uri) |
| 65 | fetchcmd = fetchcmd.replace("${FILE}", ud.basename) | 65 | fetchcmd = fetchcmd.replace("${FILE}", ud.basename) |
| 66 | httpproxy = data.getVar("http_proxy", d, True) | ||
| 67 | ftpproxy = data.getVar("ftp_proxy", d, True) | ||
| 68 | if httpproxy: | ||
| 69 | fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd | ||
| 70 | if ftpproxy: | ||
| 71 | fetchcmd = "ftp_proxy=" + ftpproxy + " " + fetchcmd | ||
| 66 | bb.msg.debug(2, bb.msg.domain.Fetcher, "executing " + fetchcmd) | 72 | bb.msg.debug(2, bb.msg.domain.Fetcher, "executing " + fetchcmd) |
| 73 | sys.exit(1) | ||
| 67 | ret = os.system(fetchcmd) | 74 | ret = os.system(fetchcmd) |
| 68 | if ret != 0: | 75 | if ret != 0: |
| 69 | return False | 76 | return False |
