diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2019-09-15 04:57:53 +0200 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2019-09-14 20:07:11 -0700 |
| commit | 6619580ca329fef1df86670457e87fdfddba6589 (patch) | |
| tree | 1ad94a810a4a49b348f73cde5056fe6f08f43e21 | |
| parent | __filter_readonly_variables: Filter ___* variables. (diff) | |
| download | gentoo-portage-6619580ca329fef1df86670457e87fdfddba6589.tar.xz gentoo-portage-6619580ca329fef1df86670457e87fdfddba6589.zip | |
__ebuild_main: Rename phase_func variable to ___phase_func.
___* variables are now automatically filtered by __filter_readonly_variables().
`unset` does not actually remove local variables, it only removes their values.
Previously phase_func variable was stored (without value) in environment.bz2 files in VDB.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | bin/phase-functions.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 0bc0d525e..92fcd3929 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -981,9 +981,8 @@ __ebuild_main() { # respect FEATURES="-ccache". has ccache $FEATURES || export CCACHE_DISABLE=1 - local phase_func=$(__ebuild_arg_to_phase "$EBUILD_PHASE") - [[ -n $phase_func ]] && __ebuild_phase_funcs "$EAPI" "$phase_func" - unset phase_func + local ___phase_func=$(__ebuild_arg_to_phase "$EBUILD_PHASE") + [[ -n ${___phase_func} ]] && __ebuild_phase_funcs "$EAPI" "${___phase_func}" __source_all_bashrcs |