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

Avoid exception looking for python on windows if the launcher (py.exe) is not installed

This commit is contained in:
guruDanny67 2018-12-30 16:00:04 +01:00 committed by Jussi Pakkanen
parent f1b32aa4bb
commit ee555e37c9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/modules/python.py
View File

@ -14,6 +14,7 @@
import os import os
import json import json
import shutil
from pathlib import Path from pathlib import Path
from .. import mesonlib from .. import mesonlib
@ -468,6 +469,9 @@ class PythonModule(ExtensionModule):
def _get_win_pythonpath(self, name_or_path): def _get_win_pythonpath(self, name_or_path):
if name_or_path not in ['python2', 'python3']: if name_or_path not in ['python2', 'python3']:
return None return None
if not shutil.which('py'):
# program not installed, return without an exception
return None
ver = {'python2': '-2', 'python3': '-3'}[name_or_path] ver = {'python2': '-2', 'python3': '-3'}[name_or_path]
cmd = ['py', ver, '-c', "import sysconfig; print(sysconfig.get_config_var('BINDIR'))"] cmd = ['py', ver, '-c', "import sysconfig; print(sysconfig.get_config_var('BINDIR'))"]
_, stdout, _ = mesonlib.Popen_safe(cmd) _, stdout, _ = mesonlib.Popen_safe(cmd)