commit: 65b4a7839d11d6f2be0f0811bce8f66f06e40ca7
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sun Jun 25 20:16:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 20:19:31 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=65b4a783
bin/save-ebuild-env.sh: refrain from using the compgen builtin
For the compgen builtin to be available requires that bash be compiled
with --enable-readline. Rather than rely on compgen to generate a list
of function names, parse their names out of declare -F instead. This
eliminates an unnecessary divergence from the master branch.
Specify -v for the following unset command, so that bash is coerced into
unsetting only variables, as is intended.
Expand the applicable variable names with "${!___@}". Owing to the
constraints placed on identifiers, it's not particularly important that
it be done this way, but I think it better expresses the intent.
Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Bug: https://bugs.gentoo.org/909148
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/save-ebuild-env.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index 36eedc7fa..294cab255 100755
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -82,13 +82,13 @@ __save_ebuild_env() {
___eapi_has_usex && unset -f usex
- # BEGIN PREFIX LOCAL: compgen is not compiled in during bootstrap
- if type compgen >& /dev/null ; then
- # Clear out the triple underscore namespace as it is reserved
by the PM.
- unset -f $(compgen -A function ___)
- unset ${!___*}
- fi
- # END PREFIX LOCAL
+ # Clear out the triple underscore namespace as it is reserved by the PM.
+ while IFS=' ' read -r _ _ REPLY; do
+ if [[ ${REPLY} == ___* ]]; then
+ unset -f "${REPLY}"
+ fi
+ done < <(declare -F)
+ unset -v REPLY "${!___@}"
# portage config variables and variables set directly by portage
unset ACCEPT_LICENSE BUILD_PREFIX COLS \
