summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb/fetch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-10-22 22:24:03 +0100
committerRichard Purdie <rpurdie@rpsys.net>2008-10-22 22:24:03 +0100
commitede20a32458a01fbc3da95c82447b49fb2b25a94 (patch)
tree20d50c2963e870e808fb746a4d91256d5c3cbee5 /bitbake/lib/bb/fetch
parent4329a29db5666adc95388c2cc2ebfacb07a81637 (diff)
downloadopenembedded-core-ede20a32458a01fbc3da95c82447b49fb2b25a94.tar.gz
openembedded-core-ede20a32458a01fbc3da95c82447b49fb2b25a94.tar.bz2
openembedded-core-ede20a32458a01fbc3da95c82447b49fb2b25a94.tar.xz
openembedded-core-ede20a32458a01fbc3da95c82447b49fb2b25a94.zip
bitbake: Improve proxy variable handling in fetchers
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r--bitbake/lib/bb/fetch/__init__.py6
-rw-r--r--bitbake/lib/bb/fetch/wget.py7
2 files changed, 13 insertions, 0 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index a4ede2b77..ab7a9bed9 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -465,6 +465,12 @@ class Fetch(object):
uri = stash + tarfn
bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
fetchcmd = fetchcmd.replace("${URI}", uri)
+ httpproxy = data.getVar("http_proxy", d, True)
+ ftpproxy = data.getVar("ftp_proxy", d, True)
+ if httpproxy:
+ fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd
+ if ftpproxy:
+ fetchcmd = "ftp_proxy=" + ftpproxy + " " + fetchcmd
ret = os.system(fetchcmd)
if ret == 0:
bb.msg.note(1, bb.msg.domain.Fetcher, "Fetched %s from tarball stash, skipping checkout" % tarfn)
diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py
index 739d5a1bc..c125ecb59 100644
--- a/bitbake/lib/bb/fetch/wget.py
+++ b/bitbake/lib/bb/fetch/wget.py
@@ -63,7 +63,14 @@ class Wget(Fetch):
bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
fetchcmd = fetchcmd.replace("${URI}", uri)
fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
+ httpproxy = data.getVar("http_proxy", d, True)
+ ftpproxy = data.getVar("ftp_proxy", d, True)
+ if httpproxy:
+ fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd
+ if ftpproxy:
+ fetchcmd = "ftp_proxy=" + ftpproxy + " " + fetchcmd
bb.msg.debug(2, bb.msg.domain.Fetcher, "executing " + fetchcmd)
+ sys.exit(1)
ret = os.system(fetchcmd)
if ret != 0:
return False