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 C8E09158015 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 BA1FB2BC023; Wed, 20 Dec 2023 14:04:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 9B3E52BC023 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 7D914340906 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 C2BDD13A0 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.a2409ba65d38d2eb8cb3923733d9062e3b4da1ad.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: a2409ba65d38d2eb8cb3923733d9062e3b4da1ad 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: 6a4ce46f-e937-4d6a-8bd7-7c4d3b832cd0 X-Archives-Hash: b58ffa5d5e767e37539abfc875fef61d commit: a2409ba65d38d2eb8cb3923733d9062e3b4da1ad Author: Eli Schwartz gmail com> AuthorDate: Wed Dec 20 05:56:53 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=a2409ba6 ebuild: command not found QA: detect in dash as well Bug: https://bugs.gentoo.org/822033 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> lib/portage/package/ebuild/doebuild.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index d10b157b68..e651f28d06 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -2274,6 +2274,7 @@ def _check_build_log(mysettings, out=None): bash_command_not_found_re = re.compile( r"(.*): line (\d*): (.*): command not found$" ) + dash_command_not_found_re = re.compile(r"(.*): (\d+): (.*): not found$") command_not_found_exclude_re = re.compile(r"/configure: line ") helper_missing_file = [] helper_missing_file_re = re.compile(r"^!!! (do|new).*: .* does not exist$") @@ -2384,6 +2385,12 @@ def _check_build_log(mysettings, out=None): ): command_not_found.append(line.rstrip("\n")) + if ( + dash_command_not_found_re.match(line) is not None + and command_not_found_exclude_re.search(line) is None + ): + command_not_found.append(line.rstrip("\n")) + if helper_missing_file_re.match(line) is not None: helper_missing_file.append(line.rstrip("\n"))