Virtualization/meson
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/meson.git synced 2025-11-08 23:10:00 +08:00
Code Issues Projects Releases Wiki Activity

environment: handle machine file options sections with more than one subproject

Browse Source 
Instead of having a raw python exception, provide a helpful error
message that `[sub:sub1:project options]` should just be `[sub1:project
options]`

No test is provided as this is basic error handling, and I felt it was
not worth adding to our test runtime to test that we don't raise a raw
exception.

Fixes: #14222
This commit is contained in:
Dylan Baker
2025-02-04 13:54:44 -08:00
parent 97a1c567c9
commit 906f376b52
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mesonbuild/environment.py
View File

@ -273,7 +273,7 @@ class Environment:
for section, values in config.items():
if ':' in section:
section_subproject, section = section.split(':')
section_subproject, section = section.split(':', 1)
else:
section_subproject = ''
if section == 'built-in options':
@ -290,6 +290,13 @@ class Environment:
# Project options are always for the host machine
key = self.mfilestr2key(strk, section, section_subproject, machine)
self.options[key] = v
elif ':' in section:
correct_subproject, correct_section = section.split(':')[-2:]
raise MesonException(
'Subproject options should always be set as '
'`[subproject:section]`, even if the options are from a '
'nested subproject. '
f'Replace `[{section_subproject}:{section}]` with `[{correct_subproject}:{correct_section}]`')
def _set_default_options_from_env(self) -> None:
opts: T.List[T.Tuple[str, str]] = (