packages: rpm-build-macros/rpm.macros - kill weird overquoting

glen glen at pld-linux.org
Mon Oct 25 14:58:02 CEST 2010


Author: glen                         Date: Mon Oct 25 12:58:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- kill weird overquoting

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.588 -> 1.589) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.588 packages/rpm-build-macros/rpm.macros:1.589
--- packages/rpm-build-macros/rpm.macros:1.588	Wed Oct 20 12:36:52 2010
+++ packages/rpm-build-macros/rpm.macros	Mon Oct 25 14:57:56 2010
@@ -1967,18 +1967,18 @@
 
 # migrate from init script to upstart job
 %upstart_post() \
-	if [ -f /var/lock/subsys/"%1" ] ; then \
-		/sbin/service --no-upstart "%1" stop \
-		/sbin/service "%1" start \
+	if [ -f /var/lock/subsys/%1 ]; then \
+		/sbin/service --no-upstart %1 stop \
+		/sbin/service %1 start \
 	fi
 
 # restart the job after upgrade or migrate to init script on removal
 # cannot be stopped with 'service' as /etc/init/$name.conf may be missing
 # at this point
 %upstart_postun() \
-	if [ -x /sbin/initctl ] && /sbin/initctl status "%1" 2>/dev/null | grep -q 'running' ; then \
-		/sbin/initctl stop "%1" >/dev/null 2>&1 \
-		[ -f "/etc/rc.d/init.d/%1" -o -f "/etc/init/%1.conf" ] && { echo -n "Re-" ; /sbin/service "%1" start ; } ; \
+	if [ -x /sbin/initctl ] && /sbin/initctl status %1 2>/dev/null | grep -q 'running' ; then \
+		/sbin/initctl stop %1 >/dev/null 2>&1 \
+		[ -f /etc/rc.d/init.d/%1 -o -f /etc/init/%1.conf ] && { echo -n "Re-"; /sbin/service %1 start; }; \
 	fi
 
 # vim:ts=4 sw=4 noet ft=spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.588&r2=1.589&f=u



More information about the pld-cvs-commit mailing list