- %service: omit completely messages when -q is used

Changed files:
    rpm.macros -> 1.260

diff --git a/rpm.macros b/rpm.macros
index 21644391d8330d94a7f7ea4bd2299934d0b84a5b..c3d9d15c7565a77567b6823b9a8bc44fc1abbb06 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -735,8 +735,8 @@ skip_auto_restart() { \
 if [ -f /var/lock/subsys/%1 ]; then \
        if [ $(skip_auto_restart) = no ]; then \
                /etc/rc.d/init.d/%1 %2 1>&2; \
-       else \
-               echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %{!?3:%1 service}%{?3:%(set -- %{*}; echo "$3")}.'; \
+%{!-q:else} \
+       %{!-q:echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %{!?3:%1 service}%{?3:%(set -- %{*}; echo "$3")}.';} \
        fi \
 %{!-q:else} \
        %{!-q:echo 'Run "/etc/rc.d/init.d/%1 start" to start %{!?3:%1 service}%{?3:%(set -- %{*}; echo "$3")}.';} \