diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-25 21:34:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-25 21:34:44 +0000 |
| commit | c8273fedd2484bf9dde5136274144125a063507d (patch) | |
| tree | 29ec86cf2fdabddfc1d6374b3bbc9f90b4864dfc | |
| parent | 2a76de7db7688d6dfc92cce85f78832522e56f00 (diff) | |
| download | portage-c8273fedd2484bf9dde5136274144125a063507d.tar.gz portage-c8273fedd2484bf9dde5136274144125a063507d.tar.bz2 portage-c8273fedd2484bf9dde5136274144125a063507d.zip | |
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.
svn path=/main/trunk/; revision=8662
| -rwxr-xr-x | bin/ebuild.sh | 6 |
1 files 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 |