* 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
(trunk r8796)

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

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 0147a0b16fd7556e0af16528a59f1b02867824de..fc832a51f0d56f79c6978cde5de2ca11d661425a 100644 (file)
--- 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.py b/pym/portage.py
index 601c12f379168aade6e1fdc352b80a760e6a096e..63858e5e6e384cfbd15e7df264d5c9dd44b19cec 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1018,6 +1018,14 @@ class config:
                "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
@@ -1026,10 +1034,7 @@ class config:
 
        # 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