1 |
commit: 6619580ca329fef1df86670457e87fdfddba6589 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Sun Sep 15 02:57:53 2019 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 15 03:07:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6619580c |
7 |
|
8 |
__ebuild_main: Rename phase_func variable to ___phase_func. |
9 |
|
10 |
___* variables are now automatically filtered by __filter_readonly_variables(). |
11 |
`unset` does not actually remove local variables, it only removes their values. |
12 |
Previously phase_func variable was stored (without value) in environment.bz2 files in VDB. |
13 |
|
14 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
16 |
|
17 |
bin/phase-functions.sh | 5 ++--- |
18 |
1 file changed, 2 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
21 |
index 0bc0d525e..92fcd3929 100644 |
22 |
--- a/bin/phase-functions.sh |
23 |
+++ b/bin/phase-functions.sh |
24 |
@@ -981,9 +981,8 @@ __ebuild_main() { |
25 |
# respect FEATURES="-ccache". |
26 |
has ccache $FEATURES || export CCACHE_DISABLE=1 |
27 |
|
28 |
- local phase_func=$(__ebuild_arg_to_phase "$EBUILD_PHASE") |
29 |
- [[ -n $phase_func ]] && __ebuild_phase_funcs "$EAPI" "$phase_func" |
30 |
- unset phase_func |
31 |
+ local ___phase_func=$(__ebuild_arg_to_phase "$EBUILD_PHASE") |
32 |
+ [[ -n ${___phase_func} ]] && __ebuild_phase_funcs "$EAPI" "${___phase_func}" |
33 |
|
34 |
__source_all_bashrcs |