summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-01 22:26:29 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-01 22:26:29 +0000
commit94b68f3fa1487c9b32c0646c3c4e4ee339b9f866 (patch)
tree475f67a7174561e5fce68eb13b4cd89795b87fdf /bin/isolated-functions.sh
parentShow the pid in the "starting parallel fetching" message. (diff)
downloadportage-multirepo-94b68f3fa1487c9b32c0646c3c4e4ee339b9f866.tar.gz
portage-multirepo-94b68f3fa1487c9b32c0646c3c4e4ee339b9f866.tar.bz2
portage-multirepo-94b68f3fa1487c9b32c0646c3c4e4ee339b9f866.zip
* 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
Diffstat (limited to 'bin/isolated-functions.sh')
-rwxr-xr-xbin/isolated-functions.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 0147a0b1..fc832a51 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.