SOURCES (AC-branch): rpm.macros, rpm.macros - %apache_config_insta...

[glen]

Author: glen                         Date: Fri Jul 15 11:14:52 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- %apache_config_install: skip webserver reload if webserver itself is upgraded, as the webserver restart is in it's %post anyway

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.52 -> 1.158.4.53) 
SOURCES:
   rpm.macros (1.230 -> 1.231) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.52 SOURCES/rpm.macros:1.158.4.53
--- SOURCES/rpm.macros:1.158.4.52	Thu Jul 14 20:26:25 2005
+++ SOURCES/rpm.macros	Fri Jul 15 13:14:47 2005
@@ -687,7 +687,8 @@
 fi\
 # reload apache if the config symlink is there\
 if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then\
-	if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\
+	# additionally don't reload if target package (the webserver) is upgraded, as webserver is restarted anyway in %post \
+	if [ "$2" != "2" ] && [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\
 		/etc/rc.d/init.d/%{__apache_svcname %{-v*}} reload 1>&2\
 	fi\
 fi\

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.230 SOURCES/rpm.macros:1.231
--- SOURCES/rpm.macros:1.230	Thu Jul 14 20:26:25 2005
+++ SOURCES/rpm.macros	Fri Jul 15 13:14:47 2005
@@ -688,7 +688,8 @@
 fi\
 # reload apache if the config symlink is there\
 if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then\
-	if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\
+	# additionally don't reload if target package (the webserver) is upgraded, as webserver is restarted anyway in %post \
+	if [ "$2" != "2" ] && [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\
 		/etc/rc.d/init.d/%{__apache_svcname %{-v*}} reload 1>&2\
 	fi\
 fi\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.52&r2=1.158.4.53&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.230&r2=1.231&f=u