diff options
| author | Nellie Zhang <nelliezh@gmail.com> | 2021-05-02 11:09:11 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-05-03 13:06:05 -0700 |
| commit | 802f66f442d4ce8d5aadc6cbeb67ec7db2414da4 (patch) | |
| tree | 8f49ad44051e57d0c8e7083d36469d8edb171688 | |
| parent | a48a89374a57297420863bd9fa3c2ef2e4a6a064 (diff) | |
| download | meson-802f66f442d4ce8d5aadc6cbeb67ec7db2414da4.zip meson-802f66f442d4ce8d5aadc6cbeb67ec7db2414da4.tar.gz meson-802f66f442d4ce8d5aadc6cbeb67ec7db2414da4.tar.bz2 | |
Clarify incorrect configuration format message
Print the path and line where the problem occurred to make it more clear
what the error message means.
| -rw-r--r-- | mesonbuild/mesonlib/universal.py | 6 | ||||
| -rwxr-xr-x | run_unittests.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py index 45c3e5c..ee1152c 100644 --- a/mesonbuild/mesonlib/universal.py +++ b/mesonbuild/mesonlib/universal.py @@ -1096,7 +1096,7 @@ def get_variable_regex(variable_format: str = 'meson') -> T.Pattern[str]: raise MesonException(f'Format "{variable_format}" not handled') return regex -def do_conf_str (data: list, confdata: 'ConfigurationData', variable_format: str, +def do_conf_str (src: str, data: list, confdata: 'ConfigurationData', variable_format: str, encoding: str = 'utf-8') -> T.Tuple[T.List[str],T.Set[str], bool]: def line_is_valid(line : str, variable_format: str) -> bool: if variable_format == 'meson': @@ -1124,7 +1124,7 @@ def do_conf_str (data: list, confdata: 'ConfigurationData', variable_format: str line = do_define(regex, line, confdata, variable_format) else: if not line_is_valid(line,variable_format): - raise MesonException(f'Format "{variable_format}" mismatched') + raise MesonException(f'Format error in {src}: saw "{line.strip()}" when format set to "{variable_format}"') line, missing = do_replacement(regex, line, variable_format, confdata) missing_variables.update(missing) if missing: @@ -1141,7 +1141,7 @@ def do_conf_file(src: str, dst: str, confdata: 'ConfigurationData', variable_for except Exception as e: raise MesonException('Could not read input file {}: {}'.format(src, str(e))) - (result, missing_variables, confdata_useless) = do_conf_str(data, confdata, variable_format, encoding) + (result, missing_variables, confdata_useless) = do_conf_str(src, data, confdata, variable_format, encoding) dst_tmp = dst + '~' try: with open(dst_tmp, 'w', encoding=encoding, newline='') as f: diff --git a/run_unittests.py b/run_unittests.py index 828c80e..1556b10 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2126,7 +2126,7 @@ class AllPlatformTests(BasePlatformTests): def test_do_conf_file_by_format(self): def conf_str(in_data, confdata, vformat): - (result, missing_variables, confdata_useless) = mesonbuild.mesonlib.do_conf_str(in_data, confdata, variable_format = vformat) + (result, missing_variables, confdata_useless) = mesonbuild.mesonlib.do_conf_str('configuration_file', in_data, confdata, variable_format = vformat) return '\n'.join(result) def check_formats(confdata, result): |