From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 2 Sep 2010 19:56:24 +0000 (-0700)
Subject: Filter more variables that don't need to end up in environment.bz2.
X-Git-Tag: v2.2_rc74~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2da227e57f695dc173b22802443084c5fec539b0;p=portage.git

Filter more variables that don't need to end up in environment.bz2.
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 12feea0ed..950c917c6 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -545,7 +545,7 @@ save_ebuild_env() {
 			TERM TERMCAP USER
 
 		# other variables inherited from the calling environment
-		unset ECHANGELOG_USER GPG_AGENT_INFO \
+		unset CVS_RSH DCCC_PATH ECHANGELOG_USER GPG_AGENT_INFO \
 		SSH_AGENT_PID SSH_AUTH_SOCK STY WINDOW XAUTHORITY
 
 		# CCACHE and DISTCC config
diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 86226157e..70db71b24 100644
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -126,12 +126,14 @@ environ_filter += [
 
 # portage config variables and variables set directly by portage
 environ_filter += [
-	"ACCEPT_KEYWORDS", "ACCEPT_PROPERTIES", "AUTOCLEAN",
+	"ACCEPT_CHOSTS", "ACCEPT_KEYWORDS", "ACCEPT_PROPERTIES", "AUTOCLEAN",
 	"CLEAN_DELAY", "COLLISION_IGNORE", "CONFIG_PROTECT",
 	"CONFIG_PROTECT_MASK", "EGENCACHE_DEFAULT_OPTS", "EMERGE_DEFAULT_OPTS",
 	"EMERGE_LOG_DIR",
-	"EMERGE_WARNING_DELAY", "FETCHCOMMAND", "FETCHCOMMAND_FTP",
-	"FETCHCOMMAND_HTTP", "FETCHCOMMAND_SFTP",
+	"EMERGE_WARNING_DELAY",
+	"FETCHCOMMAND", "FETCHCOMMAND_FTP",
+	"FETCHCOMMAND_HTTP", "FETCHCOMMAND_HTTPS",
+	"FETCHCOMMAND_RSYNC", "FETCHCOMMAND_SFTP",
 	"GENTOO_MIRRORS", "NOCONFMEM", "O",
 	"PORTAGE_BACKGROUND",
 	"PORTAGE_BINHOST_CHUNKSIZE", "PORTAGE_CALLER",
@@ -148,8 +150,10 @@ environ_filter += [
 	"PORTAGE_RSYNC_RETRIES", "PORTAGE_SYNC_STALE",
 	"PORTAGE_USE", "PORT_LOGDIR",
 	"QUICKPKG_DEFAULT_OPTS",
-	"RESUMECOMMAND", "RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTP",
-	"RESUMECOMMAND_SFTP", "SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER",
+	"RESUMECOMMAND", "RESUMECOMMAND_FTP",
+	"RESUMECOMMAND_HTTP", "RESUMECOMMAND_HTTPS",
+	"RESUMECOMMAND_RSYNC", "RESUMECOMMAND_SFTP",
+	"SYNC", "USE_EXPAND_HIDDEN", "USE_ORDER",
 ]
 
 environ_filter = frozenset(environ_filter)