From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 14 Jul 2020 14:30:46 +0000 (+0200)
Subject: rpm: include macro name in errors for two args macros too
X-Git-Tag: v246-rc2~74^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1061fc1c1734ae67afe015fb6adbf25fa247b407;p=thirdparty%2Fsystemd.git

rpm: include macro name in errors for two args macros too
---

diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
index df87b6eff06..8832c4a6f40 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -127,7 +127,7 @@ SYSTEMD_INLINE_EOF\
 #   %files
 #   %{_sysusersdir}/%{name}.conf
 %sysusers_create_package() \
-%{expand:%%{?!__systemd_twoargs_%#:%%{error:This macro requires two arguments}}} \
+%{expand:%%{?!__systemd_twoargs_%#:%%{error:The %%%%sysusers_create_package macro requires two arguments}}} \
 systemd-sysusers --replace=%_sysusersdir/%1.conf - <<SYSTEMD_INLINE_EOF || : \
 %(cat %2) \
 SYSTEMD_INLINE_EOF\
@@ -147,7 +147,7 @@ SYSTEMD_INLINE_EOF\
 #   %files
 #   %{_tmpfilesdir}/%{name}.conf
 %tmpfiles_create_package() \
-%{expand:%%{?!__systemd_twoargs_%#:%%{error:This macro requires two arguments}}} \
+%{expand:%%{?!__systemd_twoargs_%#:%%{error:The %%%%tmpfiles_create_package macro requires two arguments}}} \
 systemd-tmpfiles --replace=%_tmpfilesdir/%1.conf --create - <<SYSTEMD_INLINE_EOF || : \
 %(cat %2) \
 SYSTEMD_INLINE_EOF\