summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-07-28 00:09:40 +0000
committerZac Medico <zmedico@gentoo.org>2007-07-28 00:09:40 +0000
commitd06f326b29063db810690b6b8528d43a49902abf (patch)
treeeec90f9d8df61a0eb12135902e42c3ba668fcb6a
parent090b9f4cc7a8a00994440e28902a4611113b96ce (diff)
downloadportage-d06f326b29063db810690b6b8528d43a49902abf.tar.gz
portage-d06f326b29063db810690b6b8528d43a49902abf.tar.bz2
portage-d06f326b29063db810690b6b8528d43a49902abf.zip
For bug #185048, make emerge-webrsync honor http_proxy and ftp_proxy from make.conf. (trunk r7415)
svn path=/main/branches/2.1.2/; revision=7416
-rwxr-xr-xbin/emerge-webrsync4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index d8c025732..1e5f60ba1 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -8,9 +8,9 @@
type portageq > /dev/null || exit $?
eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \
PORTAGE_BIN_PATH PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \
- GENTOO_MIRRORS PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \
- PORTAGE_TMPDIR PORTDIR PORTAGE_RSYNC_EXTRA_OPTS)
+ PORTAGE_TMPDIR PORTDIR PORTAGE_RSYNC_EXTRA_OPTS http_proxy ftp_proxy)
DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync"
+export http_proxy ftp_proxy
# If PORTAGE_NICENESS is overriden via the env then it will
# still pass through the portageq call and override properly.