From ef618e83d43401c49b0796acfafa43e81bc4e77f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 12 Jan 2008 01:47:04 +0000 Subject: In preprocess_ebuild_env(), move a filter_readonly_variables call out of a subshell since FreeBSD and prefix users have reported apparent corruption of the PATH environment variable that triggers calls to the wrong version of sed (one that does not support the -r option). (trunk r9193:9195) svn path=/main/branches/2.1.2/; revision=9196 --- bin/ebuild.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index ef21d222d..1bcd02852 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1486,10 +1486,11 @@ preprocess_ebuild_env() { # and functions that could interfere with the current environment. save_ebuild_env || exit $? touch "${T}/environment.success" || exit $? - ) | filter_readonly_variables > "${T}/environment.filtered" + ) > "${T}/environment.filtered" local retval if [ -e "${T}/environment.success" ] ; then - mv "${T}/environment.filtered" "${T}/environment" + filter_readonly_variables < \ + "${T}/environment.filtered" > "${T}/environment" retval=$? else retval=1 -- cgit v1.2.3-1-g7c22