commit: a2409ba65d38d2eb8cb3923733d9062e3b4da1ad Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Wed Dec 20 05:56:53 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> 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"))
