Move LD_PRELOAD and FAKEROOTKEY filtering from filter_readonly_variables()

to save_ebuild_env().

svn path=/main/trunk/; revision=8535

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8730a708c13aecf518ff2639c85b5ff3e85def54..240aaf53b5100f005aac0c5b16348a161bb5f8fd 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1367,7 +1367,7 @@ filter_readonly_variables() {
        for x in BASH SANDBOX ; do
                var_grep="${var_grep}|(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)${x}_[_[:alnum:]]*=.*"
        done
-       for x in ${readonly_vars} var_grep LD_PRELOAD FAKEROOTKEY FUNCNAME GROUPS ; do
+       for x in ${readonly_vars} FUNCNAME GROUPS ; do
                var_grep="${var_grep}|(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)${x}=.*"
        done
        var_grep=${var_grep:1} # strip the first |
@@ -1434,10 +1434,10 @@ save_ebuild_env() {
                        COLLISION_IGNORE COLS CONFIG_PROTECT CONFIG_PROTECT_MASK \
                        DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR EBUILD_MASTER_PID \
                        ECLASSDIR ECLASS_DEPTH EMERGE_DEFAULT_OPTS \
-                       EMERGE_WARNING_DELAY ENDCOL FEATURES \
+                       EMERGE_WARNING_DELAY ENDCOL FAKEROOTKEY FEATURES \
                        FETCHCOMMAND FETCHCOMMAND_FTP FETCHCOMMAND_HTTP FETCHCOMMAND_SFTP \
                        GENTOO_MIRRORS GOOD HILITE HOME IMAGE LAST_E_CMD LAST_E_LEN \
-                       NORMAL O PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
+                       LD_PRELOAD NORMAL O PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
                        PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \
                        PORTAGE_BINHOST_CHUNKSIZE PORTAGE_BUILDDIR PORTAGE_CALLER \
                        PORTAGE_COLORMAP PORTAGE_CONFIGROOT \