SOURCES: rpm.macros - %service: omit completely messages when -q i...

[glen]

Author: glen                         Date: Thu Nov  3 15:08:27 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- %service: omit completely messages when -q is used

---- Files affected:
SOURCES:
   rpm.macros (1.259 -> 1.260) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.259 SOURCES/rpm.macros:1.260
--- SOURCES/rpm.macros:1.259	Wed Nov  2 23:51:02 2005
+++ SOURCES/rpm.macros	Thu Nov  3 16:08:21 2005
@@ -735,8 +735,8 @@
 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")}.';} \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.259&r2=1.260&f=u