daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
3d3dc8
From 4433c31a80c4477b0a0c503c74e8faebc44f4453 Mon Sep 17 00:00:00 2001
3d3dc8
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
3d3dc8
Date: Thu, 7 Nov 2019 11:32:26 +0100
3d3dc8
Subject: [PATCH] meson: avoid bogus meson warning
3d3dc8
3d3dc8
With meson-0.52.0-1.module_f31+6771+f5d842eb.noarch I get:
3d3dc8
src/test/meson.build:19: WARNING: Overriding previous value of environment variable 'PATH' with a new one
3d3dc8
3d3dc8
When we're using *prepend*, the whole point is to modify an existing variable,
3d3dc8
so meson shouldn't warn. But let's set avoid the warning and shorten things by
3d3dc8
setting the final value immediately.
3d3dc8
3d3dc8
(cherry picked from commit cbe804947482998cc767bfb0c169e6263a6ef097)
3d3dc8
---
3d3dc8
 src/test/meson.build | 5 ++---
3d3dc8
 1 file changed, 2 insertions(+), 3 deletions(-)
3d3dc8
3d3dc8
diff --git a/src/test/meson.build b/src/test/meson.build
3d3dc8
index 40cf56d73d..6eaa62e53f 100644
3d3dc8
--- a/src/test/meson.build
3d3dc8
+++ b/src/test/meson.build
3d3dc8
@@ -10,12 +10,11 @@ test_hashmap_ordered_c = custom_target(
3d3dc8
 
3d3dc8
 test_include_dir = include_directories('.')
3d3dc8
 
3d3dc8
-path = run_command('sh', ['-c', 'echo "$PATH"']).stdout()
3d3dc8
+path = run_command('sh', ['-c', 'echo "$PATH"']).stdout().strip()
3d3dc8
 test_env = environment()
3d3dc8
 test_env.set('SYSTEMD_KBD_MODEL_MAP', kbd_model_map)
3d3dc8
 test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)
3d3dc8
-test_env.set('PATH', path)
3d3dc8
-test_env.prepend('PATH', meson.build_root())
3d3dc8
+test_env.set('PATH', '@0@:@1@'.format(meson.build_root(), path))
3d3dc8
 
3d3dc8
 ############################################################
3d3dc8