diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-01-19 14:28:46 -0800 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-01-28 15:53:20 -0500 |
| commit | b402817fb6f0392812bfa272bdbc05c9c30139fa (patch) | |
| tree | d182e0140f4fd2e41cea635133e85d9d07871057 | |
| parent | cc4160db04f8325b11bd901c0ff833e451902fd4 (diff) | |
| download | meson-b402817fb6f0392812bfa272bdbc05c9c30139fa.zip meson-b402817fb6f0392812bfa272bdbc05c9c30139fa.tar.gz meson-b402817fb6f0392812bfa272bdbc05c9c30139fa.tar.bz2 | |
interpreter: use find_program_impl instead of shutil.which for vcs_tag
This is the right thing to do, using which is wrong.
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index d636085..bed9278 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1686,8 +1686,7 @@ external dependencies (including libraries) must go to "dependencies".''') vcs_cmd = kwargs['command'] source_dir = os.path.normpath(os.path.join(self.environment.get_source_dir(), self.subdir)) if vcs_cmd: - # Is the command an executable in path or maybe a script in the source tree? - vcs_cmd[0] = shutil.which(vcs_cmd[0]) or os.path.join(source_dir, vcs_cmd[0]) + vcs_cmd[0] = self.find_program_impl(vcs_cmd[0]) else: vcs = mesonlib.detect_vcs(source_dir) if vcs: |