summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-20 01:00:29 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-20 01:00:29 +0000
commit4fbce2a9b7f227cb6c3a8c39aa845025afa0cc04 (patch)
tree9f25502028cd7859a9c243b10418cb3c8c95e09c
parent00de5226c55316a68f4d449ca70e544d57d0d621 (diff)
downloadportage-4fbce2a9b7f227cb6c3a8c39aa845025afa0cc04.tar.gz
portage-4fbce2a9b7f227cb6c3a8c39aa845025afa0cc04.tar.bz2
portage-4fbce2a9b7f227cb6c3a8c39aa845025afa0cc04.zip
Move LD_PRELOAD and FAKEROOTKEY filtering from filter_readonly_variables()
to save_ebuild_env(). svn path=/main/trunk/; revision=8535
-rwxr-xr-xbin/ebuild.sh6
1 files changed, 3 insertions, 3 deletions
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 \