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

Adding a conditional case in _guess_files to confirm that the complete path is put together in even if a portion of the path is a location that exists. 

For instance if C:/Program Files (x86)/folder is passed to _guess_files, it would resolve to ['C:/Program Files', '(x86)/folder'] since C:/Program Files is an actual file location that can exist.
This commit is contained in:
georgev93 2020-04-25 16:42:52 -04:00 committed by Daniel Mensinger
parent 76c36a64c3
commit 30b89ea573
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mesonbuild/cmake/traceparser.py
View File

@ -660,25 +660,40 @@ class CMakeTraceParser:
fixed_list = [] # type: T.List[str]
curr_str = None # type: T.Optional[str]
path_found = False # type: bool
for i in broken_list:
if curr_str is None:
curr_str = i
path_found = False
elif os.path.isfile(curr_str):
# Abort concatenation if curr_str is an existing file
fixed_list += [curr_str]
curr_str = i
path_found = False
elif not reg_start.match(curr_str):
# Abort concatenation if curr_str no longer matches the regex
fixed_list += [curr_str]
curr_str = i
elif reg_end.match(i) or os.path.exists('{} {}'.format(curr_str, i)):
path_found = False
elif reg_end.match(i):
# File detected
curr_str = '{} {}'.format(curr_str, i)
fixed_list += [curr_str]
curr_str = None
path_found = False
elif os.path.exists('{} {}'.format(curr_str, i)):
# Path detected
curr_str = '{} {}'.format(curr_str, i)
path_found = True
elif path_found:
# Add path to fixed_list after ensuring the whole path is in curr_str
fixed_list += [curr_str]
curr_str = i
path_found = False
else:
curr_str = '{} {}'.format(curr_str, i)
path_found = False
if curr_str:
fixed_list += [curr_str]