From b85ffbacb12701382da3404c9bd5aaf56e2c883f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Mar 2023 16:30:47 +0000 Subject: [PATCH] Fix run_tool() when git is not installed Previously, it would raise an exception. --- mesonbuild/scripts/run_tool.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/scripts/run_tool.py b/mesonbuild/scripts/run_tool.py index 88376dd26..adf767a81 100644 --- a/mesonbuild/scripts/run_tool.py +++ b/mesonbuild/scripts/run_tool.py @@ -19,7 +19,7 @@ from pathlib import Path from concurrent.futures import ThreadPoolExecutor from ..compilers import lang_suffixes -from ..mesonlib import Popen_safe +from ..mesonlib import quiet_git import typing as T if T.TYPE_CHECKING: @@ -43,8 +43,8 @@ def run_tool(name: str, srcdir: Path, builddir: Path, fn: T.Callable[..., subpro if patterns: globs = [srcdir.glob(p) for p in patterns] else: - p, o, _ = Popen_safe(['git', 'ls-files'], cwd=srcdir) - if p.returncode == 0: + r, o = quiet_git(['ls-files'], srcdir) + if r: globs = [[Path(srcdir, f) for f in o.splitlines()]] else: globs = [srcdir.glob('**/*')]