diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:04:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:04:31 +0000 |
| commit | 2856a8be053b0f9ece347013883cac4d922e5307 (patch) | |
| tree | 70d6d5168cfbf1f28e8d8b206f3ab44a394d14c2 | |
| parent | Show an error message when deletion of stale cache fails. (trunk r13315) (diff) | |
| download | portage-multirepo-2856a8be053b0f9ece347013883cac4d922e5307.tar.gz portage-multirepo-2856a8be053b0f9ece347013883cac4d922e5307.tar.bz2 portage-multirepo-2856a8be053b0f9ece347013883cac4d922e5307.zip | |
Avoid leaking some variables from ebuild_main() into the environment (local
variables are exposed to 'children'). (trunk r13316)
svn path=/main/branches/2.1.6/; revision=13487
| -rwxr-xr-x | bin/ebuild.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index c086e6d3..8fad20b8 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1901,8 +1901,6 @@ fi ebuild_main() { local f x - local export_vars="ASFLAGS CCACHE_DIR CCACHE_SIZE - CFLAGS CXXFLAGS LDFLAGS LIBCFLAGS LIBCXXFLAGS" if ! hasq $EBUILD_SH_ARGS clean depend help info nofetch ; then @@ -1931,6 +1929,7 @@ ebuild_main() { if [[ $EBUILD_PHASE != depend ]] ; then local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE") [[ -n $phase_func ]] && _ebuild_phase_funcs "$EAPI" "$phase_func" + unset phase_func fi source_all_bashrcs @@ -1971,7 +1970,8 @@ ebuild_main() { case "$EBUILD_SH_ARGS" in configure|compile) - for x in $export_vars ; do + for x in ASFLAGS CCACHE_DIR CCACHE_SIZE \ + CFLAGS CXXFLAGS LDFLAGS LIBCFLAGS LIBCXXFLAGS ; do [[ ${!x-unset} != unset ]] && export $x done |