From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 1 Dec 2007 22:26:29 +0000 (-0000)
Subject: * whitelist some misc variables from the calling environment
X-Git-Tag: v2.2_pre1~249
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94b68f3fa1487c9b32c0646c3c4e4ee339b9f866;p=portage.git

* whitelist some misc variables from the calling environment
* blacklist the same variables in save_ebuild_env() so that
  the latest values from the calling environment always
  override those from the ebuild environment

svn path=/main/trunk/; revision=8796
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 0147a0b16..fc832a51f 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -405,6 +405,10 @@ save_ebuild_env() {
 		unset COLORTERM DISPLAY EDITOR LESS LESSOPEN LOGNAME LS_COLORS PAGER \
 			TERM TERMCAP USER
 
+		# other variables inherited from the calling environment
+		unset CVS_RSH ECHANGELOG_USER GPG_AGENT_INFO \
+		SSH_AGENT_PID SSH_AUTH_SOCK STY WINDOW XAUTHORITY
+
 		# There's no need to bloat environment.bz2 with internally defined
 		# functions and variables, so filter them out if possible.
 
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index ba978bb28..222130929 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -880,6 +880,14 @@ class config(object):
 		"TERM", "TERMCAP", "USER",
 	]
 
+	# other variables inherited from the calling environment
+	_environ_whitelist += [
+		"CVS_RSH", "ECHANGELOG_USER",
+		"GPG_AGENT_INFO",
+		"SSH_AGENT_PID", "SSH_AUTH_SOCK",
+		"STY", "WINDOW", "XAUTHORITY",
+	]
+
 	_environ_whitelist = frozenset(_environ_whitelist)
 
 	# Filter selected variables in the config.environ() method so that
@@ -888,10 +896,7 @@ class config(object):
 
 	# misc variables inherited from the calling environment
 	_environ_filter += [
-		"CVS_RSH", "ECHANGELOG_USER",
-		"GPG_AGENT_INFO", "INFOPATH", "MANPATH",
-		"SSH_AGENT_PID", "SSH_AUTH_SOCK",
-		"STY", "WINDOW", "XAUTHORITY",
+		"INFOPATH", "MANPATH",
 	]
 
 	# portage config variables and variables set directly by portage