mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: Improve proxy handling got wget so urls can be excluded from the proxy

Browse Source
This commit is contained in:
Richard Purdie
2008-11-04 19:13:03 +00:00
parent 2bd4344e9a
commit c2ef2d4f5a
2 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake-dev/lib/bb/fetch/wget.py
+22 -3
View File
@@ -60,11 +60,30 @@ class Wget(Fetch):
else: else:
fetchcmd = data.getVar("FETCHCOMMAND", d, 1) fetchcmd = data.getVar("FETCHCOMMAND", d, 1)
uri = uri.split(";")[0]
uri_decoded = list(bb.decodeurl(uri))
uri_type = uri_decoded[0]
uri_host = uri_decoded[1]
bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri) bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0]) fetchcmd = fetchcmd.replace("${URI}", uri)
fetchcmd = fetchcmd.replace("${FILE}", ud.basename) fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
httpproxy = data.getVar("http_proxy", d, True) httpproxy = None
ftpproxy = data.getVar("ftp_proxy", d, True) ftpproxy = None
if uri_type == 'http':
httpproxy = data.getVar("HTTP_PROXY", d, True)
httpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split()
for p in httpproxy_ignore:
if uri_host.endswith(p):
httpproxy = None
break
if uri_type == 'ftp':
ftpproxy = data.getVar("FTP_PROXY", d, True)
ftpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split()
for p in ftpproxy_ignore:
if uri_host.endswith(p):
ftpproxy = None
break
if httpproxy: if httpproxy:
fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd
if ftpproxy: if ftpproxy:
bitbake/lib/bb/fetch/wget.py
+22 -3
View File
@@ -60,11 +60,30 @@ class Wget(Fetch):
else: else:
fetchcmd = data.getVar("FETCHCOMMAND", d, 1) fetchcmd = data.getVar("FETCHCOMMAND", d, 1)
uri = uri.split(";")[0]
uri_decoded = list(bb.decodeurl(uri))
uri_type = uri_decoded[0]
uri_host = uri_decoded[1]
bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri) bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0]) fetchcmd = fetchcmd.replace("${URI}", uri)
fetchcmd = fetchcmd.replace("${FILE}", ud.basename) fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
httpproxy = data.getVar("http_proxy", d, True) httpproxy = None
ftpproxy = data.getVar("ftp_proxy", d, True) ftpproxy = None
if uri_type == 'http':
httpproxy = data.getVar("HTTP_PROXY", d, True)
httpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split()
for p in httpproxy_ignore:
if uri_host.endswith(p):
httpproxy = None
break
if uri_type == 'ftp':
ftpproxy = data.getVar("FTP_PROXY", d, True)
ftpproxy_ignore = data.getVar("HTTP_PROXY_IGNORE", d, True).split()
for p in ftpproxy_ignore:
if uri_host.endswith(p):
ftpproxy = None
break
if httpproxy: if httpproxy:
fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd
if ftpproxy: if ftpproxy: