From 5f00c3020073962edbeb2f3f709c27acdb09fd74 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 13 Mar 2019 19:44:13 -0300 Subject: i18n: Use CustomTarget.known_kwargs at permittedKwargs() @permittedKwargs() is basically copying the logic of CustomTarget, but it is not actually up to date, leading to warnings on perfectly valid values such as 'build_by_default'. Use CustomTarget.known_kwargs instead, and only append the specific kwargs of i18n.merge_file(). Fixes https://github.com/mesonbuild/meson/issues/5079 --- mesonbuild/modules/i18n.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 7b00178d5..4b37069c4 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -64,8 +64,7 @@ class I18nModule(ExtensionModule): return [path.join(src_dir, d) for d in dirs] @FeatureNew('i18n.merge_file', '0.37.0') - @permittedKwargs({'languages', 'data_dirs', 'preset', 'args', 'po_dir', 'type', - 'input', 'output', 'install', 'install_dir'}) + @permittedKwargs(build.CustomTarget.known_kwargs | {'data_dirs', 'po_dir', 'type'}) def merge_file(self, state, args, kwargs): podir = kwargs.pop('po_dir', None) if not podir: -- cgit v1.2.3