mirror of
https://git.proxmox.com/git/fwupd
synced 2025-08-14 02:40:34 +00:00
Use 'check' when calling run_command() to avoid a warning
New versions of meson [correctly] warn when this parameter is not specified.
This commit is contained in:
parent
de71ebcc58
commit
542014ebe3
@ -2,7 +2,7 @@ if build_docs and introspection.allowed()
|
||||
toml_conf = configuration_data()
|
||||
docgen_version = source_version
|
||||
if git.found() and source_version != fwupd_version
|
||||
docgen_version = run_command(git, 'branch', '--show-current').stdout().strip()
|
||||
docgen_version = run_command([git, 'branch', '--show-current'], check: true).stdout().strip()
|
||||
endif
|
||||
toml_conf.set('version', docgen_version)
|
||||
|
||||
|
12
meson.build
12
meson.build
@ -21,11 +21,11 @@ conf.set_quoted('PACKAGE_VERSION', fwupd_version)
|
||||
git = find_program('git', required: false)
|
||||
tag = false
|
||||
if git.found()
|
||||
source_version = run_command(git, 'describe').stdout().strip()
|
||||
source_version = run_command([git, 'describe'], check: false).stdout().strip()
|
||||
if source_version == ''
|
||||
source_version = fwupd_version
|
||||
endif
|
||||
tag = run_command([git, 'describe', '--exact-match']).returncode() == 0
|
||||
tag = run_command([git, 'describe', '--exact-match'], check: false).returncode() == 0
|
||||
else
|
||||
source_version = fwupd_version
|
||||
endif
|
||||
@ -435,10 +435,7 @@ if build_standalone and efiboot.found() and efivar.found()
|
||||
endif
|
||||
|
||||
if get_option('plugin_uefi_capsule_splash')
|
||||
r = run_command([python3, 'po/test-deps'])
|
||||
if r.returncode() != 0
|
||||
error(r.stdout())
|
||||
endif
|
||||
run_command([python3, 'po/test-deps'], check: true)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -549,7 +546,8 @@ build_docs = gidocgen_dep.found() and gidocgen_app.found()
|
||||
|
||||
if build_docs and gidocgen_dep.version().version_compare('< 2022.2')
|
||||
markdown_version = run_command(
|
||||
python3, '-c', 'import markdown; print(markdown.__version__)'
|
||||
[python3, '-c', 'import markdown; print(markdown.__version__)'],
|
||||
check: true,
|
||||
).stdout().strip()
|
||||
build_docs = get_option('docs').require(
|
||||
markdown_version.version_compare('>=3.2'),
|
||||
|
@ -92,7 +92,8 @@ install_data(['uefi_capsule.conf'],
|
||||
|
||||
# add all the .po files as inputs to watch
|
||||
ux_linguas = run_command(
|
||||
'cat', files(join_paths(meson.project_source_root(), 'po', 'LINGUAS')),
|
||||
['cat', files(join_paths(meson.project_source_root(), 'po', 'LINGUAS'))],
|
||||
check: true,
|
||||
).stdout().strip().split('\n')
|
||||
ux_capsule_pofiles = []
|
||||
foreach ux_lingua: ux_linguas
|
||||
|
Loading…
Reference in New Issue
Block a user