commit: 1262f1a722ef2501594736e4de69e8981ebb631c
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sun Jul 6 16:49:03 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 13 04:19:04 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1262f1a7
phase-functions.sh: filter BASH_TRAPSIG in __filter_readonly_variables()
I spotted the new 'BASH_TRAPSIG' variable while comparing the manuals of
the 5.2 and 5.3 releases. Given that it is normally only visible from
within a trap handler, add it to the blacklist defined by the
__filter_readonly_variables() function.
See-also: 8a607ed23beb4995627f9c4e2c7580469ace56bb
Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/phase-functions.sh | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index fd3c18b28d..afe28c613f 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -92,18 +92,19 @@ __filter_readonly_variables() {
| grep -vx PATH
)
# Incorporate other variables that are known to either be set by or be
- # able to influence bash. This list was last updated for bash-5.3-rc2.
+ # able to influence bash. This list was last updated for bash-5.3.
bash_vars+=(
BASH_COMPAT BASH_ENV BASH_LOADABLES_PATH BASH_REMATCH
- BASH_XTRACEFD CDPATH CHILD_MAX COLUMNS COMPREPLY COMP_CWORD
- COMP_KEY COMP_LINE COMP_POINT COMP_TYPE COMP_WORDS COPROC
- ENV EXECIGNORE FCEDIT FIGNORE FUNCNAME FUNCNEST GLOBIGNORE
- GLOBSORT HISTCONTROL HISTFILE HISTFILESIZE HISTIGNORE HISTSIZE
- HISTTIMEFORMAT HOME HOSTFILE IGNOREEOF INPUTRC INSIDE_EMACS
- LINES MAIL MAILCHECK MAILPATH MAPFILE OLDPWD OPTARG PIPESTATUS
- POSIXLY_CORRECT PROMPT_COMMAND PROMPT_DIRTRIM PS0 PS1 PS2 PS3
- READLINE_ARGUMENT READLINE_LINE READLINE_MARK READLINE_POINT
- REPLY TIMEFORMAT TMOUT TMPDIR auto_resume histchars
+ BASH_TRAPSIG BASH_XTRACEFD CDPATH CHILD_MAX COLUMNS COMPREPLY
+ COMP_CWORD COMP_KEY COMP_LINE COMP_POINT COMP_TYPE COMP_WORDS
+ COPROC ENV EXECIGNORE FCEDIT FIGNORE FUNCNAME FUNCNEST
+ GLOBIGNORE GLOBSORT HISTCONTROL HISTFILE HISTFILESIZE
+ HISTIGNORE HISTSIZE HISTTIMEFORMAT HOME HOSTFILE IGNOREEOF
+ INPUTRC INSIDE_EMACS LINES MAIL MAILCHECK MAILPATH MAPFILE
+ OLDPWD OPTARG PIPESTATUS POSIXLY_CORRECT PROMPT_COMMAND
+ PROMPT_DIRTRIM PS0 PS1 PS2 PS3 READLINE_ARGUMENT READLINE_LINE
+ READLINE_MARK READLINE_POINT REPLY TIMEFORMAT TMOUT TMPDIR
+ auto_resume histchars
# Exported functions bear this prefix.
"BASH_FUNC_.*"
