From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 28 Jul 2007 00:09:40 +0000 (-0000)
Subject: For bug #185048, make emerge-webrsync honor http_proxy and ftp_proxy from make.conf... 
X-Git-Tag: v2.1.3~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d06f326b29063db810690b6b8528d43a49902abf;p=portage.git

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
---

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.