commit: f24dd0d9808559571509add2c8c69c1bcb2bfec6 Author: Kerin Millar <kfm <AT> plushkava <DOT> net> AuthorDate: Sun Jun 25 20:03:04 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 3 20:18:37 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f24dd0d9
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. 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index bba468da1..20cd86866 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -83,8 +83,12 @@ __save_ebuild_env() { ___eapi_has_usex && unset -f usex # Clear out the triple underscore namespace as it is reserved by the PM. - unset -f $(compgen -A function ___) - unset ${!___*} + 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 \