summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-01-12 01:47:04 +0000
committerZac Medico <zmedico@gentoo.org>2008-01-12 01:47:04 +0000
commitef618e83d43401c49b0796acfafa43e81bc4e77f (patch)
tree0cd4917e4cb078189845d50bd7b55a93426e5801
parentReplace hardcoded value with max_desc_len. (trunk r9192) (diff)
downloadportage-multirepo-ef618e83d43401c49b0796acfafa43e81bc4e77f.tar.gz
portage-multirepo-ef618e83d43401c49b0796acfafa43e81bc4e77f.tar.bz2
portage-multirepo-ef618e83d43401c49b0796acfafa43e81bc4e77f.zip
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
-rwxr-xr-xbin/ebuild.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ef21d222..1bcd0285 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