From: Zac Medico Date: Fri, 30 Nov 2007 09:03:00 +0000 (-0000) Subject: Don't use sandbox's BASH_ENV for new shells because it does X-Git-Tag: v2.2_pre1~267 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f69efaece69719080e53fbba2ee42e47b6897d6a;p=portage.git Don't use sandbox's BASH_ENV for new shells because it does 'source /etc/profile' which can interfere with the build environment by modifying our PATH. svn path=/main/trunk/; revision=8761 --- diff --git a/bin/ebuild.sh b/bin/ebuild.sh index f8f7377d7..78c423278 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -10,6 +10,10 @@ SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/dev/random" export SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_PYM_PATH}:${PORTAGE_DEPCACHEDIR}" export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:/dev/stdout:/dev/stderr:${PORTAGE_TMPDIR}" export SANDBOX_READ="${SANDBOX_READ}:/dev/shm:/dev/stdin:${PORTAGE_TMPDIR}" +# Don't use sandbox's BASH_ENV for new shells because it does +# 'source /etc/profile' which can interfere with the build +# environment by modifying our PATH. +unset BASH_ENV if [ ! -z "${PORTAGE_GPG_DIR}" ]; then SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_GPG_DIR}"