From: Stéphane Graber <stgraber@ubuntu.com>
Date: Fri, 29 Apr 2022 02:32:56 +0000 (-0400)
Subject: meson: Update run_command calls
X-Git-Tag: lxc-5.0.0~22^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa326e18e9cf3dcf26bf20248c1c631efc3b71e3;p=thirdparty%2Flxc.git

meson: Update run_command calls

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/meson.build b/meson.build
index 7d06802ef..d3b4f590d 100644
--- a/meson.build
+++ b/meson.build
@@ -183,11 +183,11 @@ endif
 ## Time EPOCH.
 sh = find_program('sh')
 git = find_program('git', required: false)
-time_epoch = run_command(sh, '-c', 'echo "$SOURCE_DATE_EPOCH"').stdout().strip()
-if time_epoch == '' and git.found() and run_command('test', '-e', '.git').returncode() == 0
+time_epoch = run_command(sh, '-c', 'echo "$SOURCE_DATE_EPOCH"', check: true).stdout().strip()
+if time_epoch == '' and git.found() and run_command('test', '-e', '.git', check: false).returncode() == 0
     # If we're in a git repository, use the creation time of the latest git tag.
-    latest_tag = run_command(git, 'describe', '--abbrev=0', '--tags').stdout().strip()
-    time_epoch = run_command(git, 'log', '--no-show-signature', '-1', '--format=%at', latest_tag).stdout()
+    latest_tag = run_command(git, 'describe', '--abbrev=0', '--tags', check: true).stdout().strip()
+    time_epoch = run_command(git, 'log', '--no-show-signature', '-1', '--format=%at', latest_tag, check: true).stdout()
 endif
 time_epoch = time_epoch.to_int()
 conf.set('TIME_EPOCH', time_epoch)
@@ -613,7 +613,7 @@ status = [
     'lxc user network database:	@0@'.format(lxc_user_network_db)]
 
 alt_time_epoch = run_command('date', '-Is', '-u', '-d',
-                             '@@0@'.format(time_epoch)).stdout().strip()
+                             '@@0@'.format(time_epoch), check: true).stdout().strip()
 status += [
     'time epoch:			@0@ (@1@)'.format(time_epoch, alt_time_epoch)]