aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/i18n.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-10-26 09:56:15 -0400
committerEli Schwartz <eschwartz93@gmail.com>2021-11-16 23:35:46 -0500
commit018d928cf51b6915f72d8377fe77b89dbd594072 (patch)
treee09c1db290cd6ea4f83fc5b7268c1d698a120eee /mesonbuild/modules/i18n.py
parent05e0712f59429423df1dc8564c067990d3430105 (diff)
downloadmeson-018d928cf51b6915f72d8377fe77b89dbd594072.zip
meson-018d928cf51b6915f72d8377fe77b89dbd594072.tar.gz
meson-018d928cf51b6915f72d8377fe77b89dbd594072.tar.bz2
i18n: Fix backtrace when missing input kwarg
When input kwarg is missing in i18n.merge_file() it was crashing with a backtrace because of kwargs['input'][0]. That code was useless anyway because CustomTarget now uses first output as default name which is what we need here.
Diffstat (limited to 'mesonbuild/modules/i18n.py')
-rw-r--r--mesonbuild/modules/i18n.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py
index 7c6f0f4..0119eb3 100644
--- a/mesonbuild/modules/i18n.py
+++ b/mesonbuild/modules/i18n.py
@@ -179,27 +179,7 @@ class I18nModule(ExtensionModule):
'install_tag': kwargs['install_tag'],
}
- # We only use this input file to create a name of the custom target.
- # Thus we can ignore the other entries.
- inputfile = kwargs['input'][0]
- if isinstance(inputfile, str):
- inputfile = mesonlib.File.from_source_file(state.environment.source_dir,
- state.subdir, inputfile)
- if isinstance(inputfile, mesonlib.File):
- # output could be '@BASENAME@' in which case we need to do substitutions
- # to get a unique target name.
- outputs = kwargs['output']
- ifile_abs = inputfile.absolute_path(state.environment.source_dir,
- state.environment.build_dir)
- values = mesonlib.get_filenames_templates_dict([ifile_abs], None)
- outputs = mesonlib.substitute_values(outputs, values)
- output = outputs[0]
- ct = build.CustomTarget(
- output + '_' + state.subdir.replace('/', '@').replace('\\', '@') + '_merge',
- state.subdir, state.subproject, T.cast(T.Dict[str, T.Any], real_kwargs))
- else:
- ct = build.CustomTarget(
- kwargs['output'][0] + '_merge', state.subdir, state.subproject,
+ ct = build.CustomTarget('', state.subdir, state.subproject,
T.cast(T.Dict[str, T.Any], real_kwargs))
return ModuleReturnValue(ct, [ct])