diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2023-04-25 14:47:37 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-07-19 18:31:37 -0400 |
| commit | 7afc69254d6b7240406cb1112ab57355bd9d32cd (patch) | |
| tree | 6246648038a69ba8e3ce48841eeb37bcad00e7d9 /mesonbuild/programs.py | |
| parent | cfc3960956f98aff74b118ce3de89a40ef3496c1 (diff) | |
| download | meson-7afc69254d6b7240406cb1112ab57355bd9d32cd.tar.gz | |
fix implicit_reexport issues and enforce them going forward
This detects cases where module A imports a function from B, and C
imports that same function from A instead of B. It's not part of the API
contract of A, and causes innocent refactoring to break things.
Diffstat (limited to 'mesonbuild/programs.py')
| -rw-r--r-- | mesonbuild/programs.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/programs.py b/mesonbuild/programs.py index 9bf1844c9..13b998193 100644 --- a/mesonbuild/programs.py +++ b/mesonbuild/programs.py @@ -103,13 +103,12 @@ class ExternalProgram(mesonlib.HoldableObject): def get_version(self, interpreter: T.Optional['Interpreter'] = None) -> str: if not self.cached_version: - from . import build raw_cmd = self.get_command() + ['--version'] if interpreter: res = interpreter.run_command_impl(interpreter.current_node, (self, ['--version']), {'capture': True, 'check': True, - 'env': build.EnvironmentVariables()}, + 'env': mesonlib.EnvironmentVariables()}, True) o, e = res.stdout, res.stderr else: |
