Meson: dict.has_key() method has no 'default' argument

Meson silently accept those keyword arguments, will produce a warning in
the future: https://github.com/mesonbuild/meson/pull/6780
This commit is contained in:
Xavier Claessens 2020-03-12 14:40:58 -04:00
parent 7ef372db76
commit 66d22c103b

View file

@ -108,7 +108,7 @@ foreach sp : subprojects
# Replace by using subproject.get_variable('plugins', []) # Replace by using subproject.get_variable('plugins', [])
# when https://github.com/mesonbuild/meson/pull/5426/files # when https://github.com/mesonbuild/meson/pull/5426/files
# is merged and released # is merged and released
if build_infos.has_key('has-plugins', default: false) if build_infos.get('has-plugins', false)
plugins = subproj.get_variable('plugins') plugins = subproj.get_variable('plugins')
else else
plugins = [] plugins = []
@ -121,7 +121,7 @@ foreach sp : subprojects
message('Created symlink to ' + project_name) message('Created symlink to ' + project_name)
endif endif
if not meson.is_cross_build() and build_infos.has_key('build-hotdoc', default: false) if not meson.is_cross_build() and build_infos.get('build-hotdoc', false)
if plugins.length() > 0 if plugins.length() > 0
plugins_doc_caches += [subproj.get_variable('plugins_doc_dep')] plugins_doc_caches += [subproj.get_variable('plugins_doc_dep')]
endif endif