From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Sat, 11 Jul 2020 14:13:54 +0000 (+0300)
Subject: rpm: avoid hiding errors and output in *_create_package macros
X-Git-Tag: v246-rc2~77^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16430%2Fhead;p=thirdparty%2Fsystemd.git

rpm: avoid hiding errors and output in *_create_package macros

Commit b0ca726585 "rpm: avoid hiding errors from systemd commands" remove hiding errors and output
for other macros, but did not do that for %sysusers_create_package and %tmpfiles_create_package.

This change syncs their behaviour with %sysusers_create and %tmpfiles_create

Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
---

diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index e5c41f68e4d..80827b6ea48 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -122,7 +122,7 @@ SYSTEMD_INLINE_EOF\
 #   %{_sysusersdir}/%{name}.conf
 %sysusers_create_package() \
 %{expand:%%{?!__systemd_twoargs_%#:%%{error:This macro requires two arguments}}} \
-systemd-sysusers --replace=%_sysusersdir/%1.conf - <<SYSTEMD_INLINE_EOF >/dev/null 2>&1 || : \
+systemd-sysusers --replace=%_sysusersdir/%1.conf - <<SYSTEMD_INLINE_EOF || : \
 %(cat %2) \
 SYSTEMD_INLINE_EOF\
 %{nil}
@@ -142,7 +142,7 @@ SYSTEMD_INLINE_EOF\
 #   %{_tmpfilesdir}/%{name}.conf
 %tmpfiles_create_package() \
 %{expand:%%{?!__systemd_twoargs_%#:%%{error:This macro requires two arguments}}} \
-systemd-tmpfiles --replace=%_tmpfilesdir/%1.conf --create - <<SYSTEMD_INLINE_EOF >/dev/null 2>&1 || : \
+systemd-tmpfiles --replace=%_tmpfilesdir/%1.conf --create - <<SYSTEMD_INLINE_EOF || : \
 %(cat %2) \
 SYSTEMD_INLINE_EOF\
 %{nil}