Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix incorrect .name attribute for python program 

It is always set to python3 even if we asked for python2...
This commit is contained in:
Eli Schwartz 2021-08-18 15:30:40 -04:00
parent 9eac9e0ff2
commit 445f08869b
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mesonbuild/modules/python.py
View File

@ -316,7 +316,7 @@ class PythonExternalProgram(ExternalProgram):
if ext_prog is None: if ext_prog is None:
super().__init__(name, command=command, silent=True) super().__init__(name, command=command, silent=True)
else: else:
self.name = ext_prog.name self.name = name
self.command = ext_prog.command self.command = ext_prog.command
self.path = ext_prog.path self.path = ext_prog.path
@ -567,6 +567,7 @@ class PythonModule(ExtensionModule):
# $PATH, or that uses a wrapper of some kind. # $PATH, or that uses a wrapper of some kind.
np: T.List[str] = state.environment.lookup_binary_entry(MachineChoice.HOST, 'python') or [] np: T.List[str] = state.environment.lookup_binary_entry(MachineChoice.HOST, 'python') or []
fallback = args[0] fallback = args[0]
display_name = fallback or 'python'
if not np and fallback is not None: if not np and fallback is not None:
np = [fallback] np = [fallback]
name_or_path = np[0] if np else None name_or_path = np[0] if np else None
@ -578,8 +579,8 @@ class PythonModule(ExtensionModule):
if not name_or_path: if not name_or_path:
python = PythonExternalProgram('python3', mesonlib.python_command) python = PythonExternalProgram('python3', mesonlib.python_command)
else: else:
tmp_python = ExternalProgram.from_entry('python3', name_or_path) tmp_python = ExternalProgram.from_entry(display_name, name_or_path)
python = PythonExternalProgram('python3', ext_prog=tmp_python) python = PythonExternalProgram(display_name, ext_prog=tmp_python)
if not python.found() and mesonlib.is_windows(): if not python.found() and mesonlib.is_windows():
pythonpath = self._get_win_pythonpath(name_or_path) pythonpath = self._get_win_pythonpath(name_or_path)