SOURCES (AC-branch): rpm.macros, rpm.macros - %service: skip else ...

[glen]

Author: glen                         Date: Sat Oct 22 19:13:49 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- %service: skip else portion generation if -q option was used

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.68 -> 1.158.4.69) 
SOURCES:
   rpm.macros (1.246 -> 1.247) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.68 SOURCES/rpm.macros:1.158.4.69
--- SOURCES/rpm.macros:1.158.4.68	Sat Oct 22 21:11:20 2005
+++ SOURCES/rpm.macros	Sat Oct 22 21:13:44 2005
@@ -794,8 +794,7 @@
 	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 }; }
 

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.246 SOURCES/rpm.macros:1.247
--- SOURCES/rpm.macros:1.246	Sat Oct 22 21:11:20 2005
+++ SOURCES/rpm.macros	Sat Oct 22 21:13:44 2005
@@ -795,8 +795,7 @@
 	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 }; }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.68&r2=1.158.4.69&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.246&r2=1.247&f=u