diff options
| author | Simon McVittie <smcv@debian.org> | 2024-10-02 12:38:01 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2024-10-02 22:58:50 +0300 |
| commit | 6224a7f48e16852dd49fc85b02a5c508500d6db0 (patch) | |
| tree | 56a521b4d9b8d7275c9e300914a1099072034e88 /mesonbuild/scripts | |
| parent | ed1d626c356e5d194b94943cd56bb99f14d38db0 (diff) | |
| download | meson-6224a7f48e16852dd49fc85b02a5c508500d6db0.tar.gz | |
env2mfile: Split detect_cross_debianlike()
Separating the part that runs dpkg-architecture from the part that
interprets its results will make it easier to unit-test the latter.
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'mesonbuild/scripts')
| -rwxr-xr-x | mesonbuild/scripts/env2mfile.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py index ff3fedafb..debf2745e 100755 --- a/mesonbuild/scripts/env2mfile.py +++ b/mesonbuild/scripts/env2mfile.py @@ -171,6 +171,9 @@ def detect_cross_debianlike(options: T.Any) -> MachineInfo: cmd = ['dpkg-architecture', '-a' + options.debarch] output = subprocess.check_output(cmd, universal_newlines=True, stderr=subprocess.DEVNULL) + return dpkg_architecture_to_machine_info(output, options) + +def dpkg_architecture_to_machine_info(output: str, options: T.Any) -> MachineInfo: data = {} for line in output.split('\n'): line = line.strip() |
