diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2023-04-19 07:56:42 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-04-23 23:03:25 -0400 |
| commit | bda799dff2dc4b5d607f0e822b12ed0e2db38fb7 (patch) | |
| tree | 56637920cced8b73cf3c7c13174e0b45cb32b570 | |
| parent | 01420bf8fc1ee6c1466e2fa4c9805267192dce26 (diff) | |
| download | meson-bda799dff2dc4b5d607f0e822b12ed0e2db38fb7.tar.gz | |
fix python.version() not working in some cases
import('python').find_installation('python').version() causes exception
because of a missing initialization, when `find_installation()` receives
a name or a path.
| -rw-r--r-- | mesonbuild/dependencies/python.py | 1 | ||||
| -rw-r--r-- | test cases/python/1 basic/meson.build | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py index 14386f96f..b9fbbbbdc 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py @@ -75,6 +75,7 @@ class BasicPythonExternalProgram(ExternalProgram): self.name = name self.command = ext_prog.command self.path = ext_prog.path + self.cached_version = None # We want strong key values, so we always populate this with bogus data. # Otherwise to make the type checkers happy we'd have to do .get() for diff --git a/test cases/python/1 basic/meson.build b/test cases/python/1 basic/meson.build index 2e543dd7d..481a88179 100644 --- a/test cases/python/1 basic/meson.build +++ b/test cases/python/1 basic/meson.build @@ -8,6 +8,9 @@ if py_version.version_compare('< 3.2') error('MESON_SKIP_TEST python 3 required for tests') endif +py_full_version = py.version() +message(f'Using python version: @py_full_version@') + py_purelib = py.get_path('purelib') if not (py_purelib.endswith('site-packages') or py_purelib.endswith('dist-packages')) error('Python3 purelib path seems invalid? ' + py_purelib) |