From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 20 Nov 2007 01:00:29 +0000 (-0000)
Subject: Move LD_PRELOAD and FAKEROOTKEY filtering from filter_readonly_variables()
X-Git-Tag: v2.2_pre1~371
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fbce2a9b7f227cb6c3a8c39aa845025afa0cc04;p=portage.git

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 8730a708c..240aaf53b 100755
--- 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 \