commit:     6dff026cea1c75726d249c02306905c42d30e5bf
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Thu May 22 18:34:53 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 30 07:37:30 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6dff026c

90gcc-warnings: test the abort variable arithmetically

That way, it acts as a quasi-boolean.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/install-qa-check.d/90gcc-warnings | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/install-qa-check.d/90gcc-warnings 
b/bin/install-qa-check.d/90gcc-warnings
index 4da17b154b..ead1243bb5 100644
--- a/bin/install-qa-check.d/90gcc-warnings
+++ b/bin/install-qa-check.d/90gcc-warnings
@@ -151,7 +151,6 @@ gcc_warn_check() {
        printf -v joined_msgs '%s|' "${msgs[@]}"
        joined_msgs=${joined_msgs%|}
 
-       abort="no"
        grep_cmd=grep
        [[ ${PORTAGE_LOG_FILE} = *.gz ]] && grep_cmd=zgrep
 
@@ -160,7 +159,7 @@ gcc_warn_check() {
        # binary when we run in the C locale.
        f=$(LC_ALL='C' sed -E -e $'s/\033\[[0-9;]*[A-Za-z]//g' < 
"${PORTAGE_LOG_FILE}" | LC_CTYPE=C LC_COLLATE=C "${grep_cmd}" -E -a 
"${joined_msgs}" | uniq)
        if [[ -n ${f} ]] ; then
-               abort="yes"
+               abort=1
 
                __vecho -ne '\n'
                eqawarn "QA Notice: Package triggers severe warnings which 
indicate that it"
@@ -171,7 +170,7 @@ gcc_warn_check() {
 
        eval "${reset_xtrace}"
 
-       if [[ ${abort} == "yes" ]] ; then
+       if (( abort )) ; then
                echo "Please do not file a Gentoo bug and instead" \
                "report the above QA issues directly to the upstream" \
                "developers of this software." | fmt -w 70 | \

Reply via email to