environment.bz2: filter more variables

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 9dcbf76f8376b79ab53b39c77f8f0ea2f172da1d..ea3f8a6aee8b206455a6dd1a9f1c07c544951d2f 100644 (file)
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -84,7 +84,7 @@ filter_readonly_variables() {
        local bash_misc_vars="BASH BASH_.* COMP_WORDBREAKS HISTCMD
                HISTFILE HOSTNAME HOSTTYPE IFS LINENO MACHTYPE OLDPWD
                OPTERR OPTIND OSTYPE POSIXLY_CORRECT PS4 PWD RANDOM
-               SECONDS SHELL SHLVL"
+               SECONDS SHELL SHLVL _"
        local filtered_sandbox_vars="SANDBOX_ACTIVE SANDBOX_BASHRC
                SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
                SANDBOX_LOG SANDBOX_ON"

diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index f99d20457a811e1750b5433174f28716c1c9253c..23e7aaa6a5231431f881a1e6250cc0d4d3f504a1 100644 (file)
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -13,7 +13,8 @@
 save_ebuild_env() {
        (
        if has --exclude-init-phases $* ; then
-               unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_
+               unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_ \
+                       PORTAGE_DOCOMPRESS PORTAGE_DOCOMPRESS_SKIP
                if [[ -n $PYTHONPATH &&
                        ${PYTHONPATH%%:*} -ef $PORTAGE_PYM_PATH ]] ; then
                        if [[ $PYTHONPATH == *:* ]] ; then
@@ -78,7 +79,8 @@ save_ebuild_env() {
                GOOD HILITE HOME \
                LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
                NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
-               PORTAGE_BASHRCS_SOURCED PORTAGE_NONFATAL PORTAGE_QUIET \
+               PORTAGE_BASHRCS_SOURCED PORTAGE_COMPRESS_EXCLUDE_SUFFIXES \
+               PORTAGE_NONFATAL PORTAGE_QUIET \
                PORTAGE_SANDBOX_DENY PORTAGE_SANDBOX_PREDICT \
                PORTAGE_SANDBOX_READ PORTAGE_SANDBOX_WRITE PREROOTPATH \
                QA_INTERCEPTORS \

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 87dccb193c5b826235631fe672799f751e48ca79..206836d41fe00b0fa91d0fb0a63b5acb69d2b7e4 100644 (file)
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -50,7 +50,7 @@ environ_whitelist += [
        "PORTAGE_BINPKG_TMPFILE",
        "PORTAGE_BIN_PATH",
        "PORTAGE_BUILDDIR", "PORTAGE_BUNZIP2_COMMAND", "PORTAGE_BZIP2_COMMAND",
-       "PORTAGE_COLORMAP",
+       "PORTAGE_COLORMAP", "PORTAGE_COMPRESS_EXCLUDE_SUFFIXES",
        "PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR",
        "PORTAGE_EBUILD_EXIT_FILE", "PORTAGE_FEATURES",
        "PORTAGE_GID", "PORTAGE_GRPNAME",
@@ -143,6 +143,7 @@ environ_filter += [
        "FETCHCOMMAND_RSYNC", "FETCHCOMMAND_SFTP",
        "GENTOO_MIRRORS", "NOCONFMEM", "O",
        "PORTAGE_BACKGROUND", "PORTAGE_BACKGROUND_UNMERGE",
+       "PORTAGE_BINHOST",
        "PORTAGE_BINHOST_CHUNKSIZE", "PORTAGE_BUILDIR_LOCKED",
        "PORTAGE_ELOG_CLASSES",
        "PORTAGE_ELOG_MAILFROM", "PORTAGE_ELOG_MAILSUBJECT",