For bug #185048, make emerge-webrsync honor http_proxy and ftp_proxy from make.conf...

svn path=/main/branches/2.1.2/; revision=7416

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index d8c025732d327405d26dc6189d9ecb94a5c124f3..1e5f60ba1183a554164be6e4c3e83bbbd77cfb18 100755 (executable)
--- 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.