diff options
| author | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-03-13 19:44:13 -0300 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-03-14 05:14:29 +0000 |
| commit | 5f00c3020073962edbeb2f3f709c27acdb09fd74 (patch) | |
| tree | e060c82715a3b9a799909fa085f3697e79cb20f3 | |
| parent | e7c4601fe3599662b4586cf4887b69110ffb4a6b (diff) | |
| download | meson-5f00c3020073962edbeb2f3f709c27acdb09fd74.zip meson-5f00c3020073962edbeb2f3f709c27acdb09fd74.tar.gz meson-5f00c3020073962edbeb2f3f709c27acdb09fd74.tar.bz2 | |
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
| -rw-r--r-- | mesonbuild/modules/i18n.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 7b00178..4b37069 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: |