diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-02 12:56:24 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-02 12:56:24 -0700 |
| commit | 2da227e57f695dc173b22802443084c5fec539b0 (patch) | |
| tree | 68df374d97bdcb2f23e571c5f008b1416186c0b9 | |
| parent | 63c4978546e5f567a974b5e342eee5408c929b41 (diff) | |
| download | portage-2da227e57f695dc173b22802443084c5fec539b0.tar.gz portage-2da227e57f695dc173b22802443084c5fec539b0.tar.bz2 portage-2da227e57f695dc173b22802443084c5fec539b0.zip | |
Filter more variables that don't need to end up in environment.bz2.
| -rw-r--r-- | bin/isolated-functions.sh | 2 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/_config/special_env_vars.py | 14 |
2 files changed, 10 insertions, 6 deletions
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) |