Skip to content

Commit

Permalink
build: Add check kwarg to run_command() calls
Browse files Browse the repository at this point in the history
WARNING: You should add the boolean check kwarg to the run_command call.
         It currently defaults to false,
         but it will default to true in future releases of meson.
         See also: mesonbuild/meson#9300
  • Loading branch information
hadess committed Jan 6, 2022
1 parent e5ec923 commit 80672c9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ui_resources = gnome.compile_resources(
c_name: 'totem'
)

r = run_command(desktop_sh, mime_type_list, uri_schemes_list)
r = run_command(desktop_sh, mime_type_list, uri_schemes_list, check: true)

desktop_conf = configuration_data()
desktop_conf.set('VERSION', totem_version)
Expand Down Expand Up @@ -109,7 +109,7 @@ configure_file(
configuration: service_conf
)

r = run_command(thumbnailer_sh, mime_type_list)
r = run_command(thumbnailer_sh, mime_type_list, check: true)

thumbnailer_conf = configuration_data()
thumbnailer_conf.set('BINDIR', totem_bindir)
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ if python_option != 'no'
if python.found()
python_req_version = '>= 3.0'

r = run_command([python, '--version'])
r = run_command([python, '--version'], check: true)
python_version = r.stdout().split(' ')[1]

pygobject_dep = dependency('pygobject-3.0', version: '>= 2.90.3', required: false)
Expand Down
4 changes: 2 additions & 2 deletions src/backend/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gst_base_plugins = [
]

foreach plugin: gst_base_plugins
r = run_command(gst_inspect, plugin)
r = run_command(gst_inspect, plugin, check: false)
assert(r.returncode() == 0,
'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-base. Please install it.')
endforeach
Expand All @@ -27,7 +27,7 @@ gst_good_plugins = [
]

foreach plugin: gst_good_plugins
r = run_command(gst_inspect, plugin)
r = run_command(gst_inspect, plugin, check: false)
assert(r.returncode() == 0,
'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.')
endforeach
Expand Down

0 comments on commit 80672c9

Please sign in to comment.