From 7cc4d8790966ffd7dd715460e07120040d84160e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 25 Nov 2007 22:50:38 +0000 Subject: [PATCH] Remove some unsafe assumptions from preprocess_ebuild_env() and note the remaining assumption that save_ebuild_env() is not overridden by the environment being loaded. (trunk r8662) svn path=/main/branches/2.1.2/; revision=8664 --- bin/ebuild.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 6e01ae8d9..60205d693 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1397,12 +1397,14 @@ preprocess_ebuild_env() { filter_readonly_variables --filter-sandbox < "${T}"/environment \ > "${T}"/environment.filtered mv "${T}"/environment.filtered "${T}"/environment + # TODO: Remove the assumption that the environment being loaded + # does not override the save_ebuild_env() function. ( source "${T}"/environment # Rely on save_ebuild_env() to filter out any remaining variables # and functions that could interfere with the current environment. - save_ebuild_env | filter_readonly_variables > "${T}"/environment - ) + save_ebuild_env + ) | filter_readonly_variables > "${T}"/environment } # @FUNCTION: save_ebuild_env -- 2.26.2