mirror of
https://github.com/systemd/systemd
synced 2024-10-14 20:17:52 +00:00
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>
This commit is contained in:
parent
93406fd379
commit
3e6e0856cd
|
@ -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}
|
||||
|
|
Loading…
Reference in a new issue