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 12feea0eda4c3d4d0366c3adfd66e9a492d68833..950c917c63d455b4e965ad122aa4d36608a9ea53 100644 (file)
--- 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 86226157ee15ed54f2df7858eeede7c81cc69a92..70db71b24b700668937da7b1a29bce5a8e62efbe 100644 (file)
--- 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)