SOURCES: rpm.macros - silence webapp macro reloading external daemon

glen glen at pld-linux.org
Mon Feb 27 10:39:24 CET 2006


Author: glen                         Date: Mon Feb 27 09:39:24 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- silence webapp macro reloading external daemon

---- Files affected:
SOURCES:
   rpm.macros (1.284 -> 1.285) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.284 SOURCES/rpm.macros:1.285
--- SOURCES/rpm.macros:1.284	Fri Feb 17 16:15:08 2006
+++ SOURCES/rpm.macros	Mon Feb 27 10:39:19 2006
@@ -735,7 +735,7 @@
 fi\
 # reload webserver if the config symlink is there and skip reload if webserver is upgraded\
 if [ -L /etc/%1/webapps.d/%2.conf ] && [ "$2" -lt "2" ]; then\
-	%{expand:%service %%1 reload}\
+	%{expand:%service -q %%1 reload}\
 fi\
 %{nil}
 
@@ -747,7 +747,7 @@
 # remove link if either of the packages are gone \
 if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%2.conf ]; then \
 	/usr/sbin/webapp unregister %1 %2\
-	%{expand:%service %%1 reload}\
+	%{expand:%service -q %%1 reload}\
 fi \
 %{nil}
 
================================================================

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



More information about the pld-cvs-commit mailing list