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

Refine cross file checking to ignore directories 

e.g. 'meson x86_64-w64-mingw32 --cross-file x86_64-w64-mingw32' currently
fails with an IsADirectoryError exception.

Cross files must be files, so when searching, only accept a candidate path
which is an existing file, not just an existing path.
This commit is contained in:
Jon Turney 2018-06-08 14:35:29 +01:00 committed by Jussi Pakkanen
parent 6461d4cda2
commit 2e34024a05
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/coredata.py
View File

@ -236,7 +236,7 @@ class CoreData:
if os.path.isabs(filename):
return filename
path_to_try = os.path.abspath(filename)
if os.path.exists(path_to_try):
if os.path.isfile(path_to_try):
return path_to_try
if sys.platform != 'win32':
paths = [
@ -244,7 +244,7 @@ class CoreData:
] + os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
for path in paths:
path_to_try = os.path.join(path, 'meson', 'cross', filename)
if os.path.exists(path_to_try):
if os.path.isfile(path_to_try):
return path_to_try
raise MesonException('Cannot find specified cross file: ' + filename)