- %service: skip else portion generation if -q option was used

Changed files:
    rpm.macros -> 1.247

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