SOURCES (AC-branch): rpm.macros, rpm.macros - make %service macro ...

[glen]

Author: glen                         Date: Thu Jul 14 16:02:32 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- make %service macro being oneliner in shell context (put it into a codeblock)

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.50 -> 1.158.4.51) 
SOURCES:
   rpm.macros (1.228 -> 1.229) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.50 SOURCES/rpm.macros:1.158.4.51
--- SOURCES/rpm.macros:1.158.4.50	Sun Jul 10 13:43:40 2005
+++ SOURCES/rpm.macros	Thu Jul 14 18:02:27 2005
@@ -754,21 +754,21 @@
 #
 #  -q be silent when service isn't started (for postun scriplets)
 #
-%service(q) \
+%service(q) {{ \
 # we use function, not to globber namespace with useless variables \
 skip_auto_restart() { \
-	. /etc/sysconfig/rpm # global setting \
-	[ -f /etc/sysconfig/%1 ] && . /etc/sysconfig/%1 # per service setting \
-	echo ${RPM_SKIP_AUTO_RESTART:-no} \
-} \
+	. /etc/sysconfig/rpm; # global setting \
+	[ -f /etc/sysconfig/%1 ] && . /etc/sysconfig/%1; # per service setting \
+	echo ${RPM_SKIP_AUTO_RESTART:-no}; \
+}; \
 if [ -f /var/lock/subsys/%1 ]; then \
 	if [ $(skip_auto_restart) = no ]; then \
-		/etc/rc.d/init.d/%1 %2 1>&2 \
+		/etc/rc.d/init.d/%1 %2 1>&2; \
 	else \
-		echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %1 service.' \
+		echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %1 service.'; \
 	fi \
 else \
-	%{!-q:echo 'Run "/etc/rc.d/init.d/%1 start" to start %1 service.'} \
-	%{-q::} \
-fi;
+	%{!-q:echo 'Run "/etc/rc.d/init.d/%1 start" to start %1 service.';} \
+	%{-q::;} \
+fi }};
 

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.228 SOURCES/rpm.macros:1.229
--- SOURCES/rpm.macros:1.228	Sun Jul 10 13:43:40 2005
+++ SOURCES/rpm.macros	Thu Jul 14 18:02:27 2005
@@ -755,21 +755,21 @@
 #
 #  -q be silent when service isn't started (for postun scriplets)
 #
-%service(q) \
+%service(q) {{ \
 # we use function, not to globber namespace with useless variables \
 skip_auto_restart() { \
-	. /etc/sysconfig/rpm # global setting \
-	[ -f /etc/sysconfig/%1 ] && . /etc/sysconfig/%1 # per service setting \
-	echo ${RPM_SKIP_AUTO_RESTART:-no} \
-} \
+	. /etc/sysconfig/rpm; # global setting \
+	[ -f /etc/sysconfig/%1 ] && . /etc/sysconfig/%1; # per service setting \
+	echo ${RPM_SKIP_AUTO_RESTART:-no}; \
+}; \
 if [ -f /var/lock/subsys/%1 ]; then \
 	if [ $(skip_auto_restart) = no ]; then \
-		/etc/rc.d/init.d/%1 %2 1>&2 \
+		/etc/rc.d/init.d/%1 %2 1>&2; \
 	else \
-		echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %1 service.' \
+		echo 'Run "/etc/rc.d/init.d/%1 %2" to %2 %1 service.'; \
 	fi \
 else \
-	%{!-q:echo 'Run "/etc/rc.d/init.d/%1 start" to start %1 service.'} \
-	%{-q::} \
-fi;
+	%{!-q:echo 'Run "/etc/rc.d/init.d/%1 start" to start %1 service.';} \
+	%{-q::;} \
+fi }};
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.50&r2=1.158.4.51&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.228&r2=1.229&f=u