From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 247F6158015 for ; Wed, 20 Dec 2023 14:04:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 612EA2BC01F; Wed, 20 Dec 2023 14:04:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42F412BC01F for ; Wed, 20 Dec 2023 14:04:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82901340BCD for ; Wed, 20 Dec 2023 14:04:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD03B131D for ; Wed, 20 Dec 2023 14:04:24 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1703081052.e26bd1dfab6f31fb2b176b97ace56a7234d35b4d.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/doebuild.py X-VCS-Directories: lib/portage/package/ebuild/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e26bd1dfab6f31fb2b176b97ace56a7234d35b4d X-VCS-Branch: master Date: Wed, 20 Dec 2023 14:04:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4fa987e3-a547-4cc8-afa3-a89a62c23680 X-Archives-Hash: 8bd7e4bdb4347424760d69e1d429bd40 commit: e26bd1dfab6f31fb2b176b97ace56a7234d35b4d Author: Eli Schwartz gmail com> AuthorDate: Wed Dec 20 05:54:57 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 20 14:04:12 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e26bd1df ebuild: use generic variable for QA notices for command not found calling this "bash_command_not_found" is overly specific. Just because bash is used to detect the case doesn't mean it's specific to bash. And really we should extend this find command_not_found for other environments too. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> lib/portage/package/ebuild/doebuild.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 956f8c0489..d10b157b68 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -2270,7 +2270,7 @@ def _check_build_log(mysettings, out=None): f = gzip.GzipFile(filename="", mode="rb", fileobj=f) am_maintainer_mode = [] - bash_command_not_found = [] + command_not_found = [] bash_command_not_found_re = re.compile( r"(.*): line (\d*): (.*): command not found$" ) @@ -2382,7 +2382,7 @@ def _check_build_log(mysettings, out=None): bash_command_not_found_re.match(line) is not None and command_not_found_exclude_re.search(line) is None ): - bash_command_not_found.append(line.rstrip("\n")) + command_not_found.append(line.rstrip("\n")) if helper_missing_file_re.match(line) is not None: helper_missing_file.append(line.rstrip("\n")) @@ -2444,10 +2444,10 @@ def _check_build_log(mysettings, out=None): ) _eqawarn(msg) - if bash_command_not_found: + if command_not_found: msg = [_("QA Notice: command not found:")] msg.append("") - msg.extend("\t" + line for line in bash_command_not_found) + msg.extend("\t" + line for line in command_not_found) _eqawarn(msg) if helper_missing_file: