From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 26 Nov 2010 22:04:28 +0000 (-0800)
Subject: whitelist proxy vars and don't save them
X-Git-Tag: v2.2.0_alpha6~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28a9bddd91a9129cd71db57a34e6048cef1b31e8;p=portage.git

whitelist proxy vars and don't save them
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index cf258bef3..1403c0aac 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -542,7 +542,7 @@ save_ebuild_env() {
 
 		# misc variables inherited from the calling environment
 		unset COLORTERM DISPLAY EDITOR LESS LESSOPEN LOGNAME LS_COLORS PAGER \
-			TERM TERMCAP USER
+			TERM TERMCAP USER ftp_proxy http_proxy no_proxy
 
 		# other variables inherited from the calling environment
 		unset CVS_RSH ECHANGELOG_USER GPG_AGENT_INFO \
diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 52b8b3a29..31b10cd22 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -77,6 +77,7 @@ environ_whitelist += [
 	"COLORTERM", "DISPLAY", "EDITOR", "LESS",
 	"LESSOPEN", "LOGNAME", "LS_COLORS", "PAGER",
 	"TERM", "TERMCAP", "USER",
+	'ftp_proxy', 'http_proxy', 'no_proxy',
 ]
 
 # tempdir settings