[Pkg-apache-commits] r1129 - in /trunk/apache2: apache2.2-common.postrm changelog

[sf at alioth.debian.org]

Author: sf
Date: Fri Jan 29 21:32:54 2010
New Revision: 1129

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1129
Log:
Add a hook to apache2.2-common's postrm script that may come in handy      
when upgrading to 2.4

Modified:
    trunk/apache2/apache2.2-common.postrm
    trunk/apache2/changelog

Modified: trunk/apache2/apache2.2-common.postrm
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.postrm?rev=1129&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.postrm (original)
+++ trunk/apache2/apache2.2-common.postrm Fri Jan 29 21:32:54 2010
@@ -2,7 +2,30 @@
 
 set -e
 
-if [ "$1" = purge ] ; then
+# Allow apache 2.4 to override what we do.
+if [ -x /etc/apache2/upgrade-to-2.4-in-progress ] ; then
+	set +e
+	/etc/apache2/upgrade-to-2.4-in-progress $0 "$@"
+	ret=$?
+	set -e
+	case $ret in
+	42)
+		exit 0
+		;;
+	43)
+		DONT_PURGE=1
+		;;
+	0)
+		: # do nothing
+		;;
+	*)
+		exit $ret
+		;;
+	esac
+fi
+
+
+if [ "$1" = purge -a "$DONT_PURGE" != 1 ] ; then
 	rm -f 	/etc/apache2/httpd.conf \
 		/var/cache/apache2/reload \
 		/var/log/apache2/access.log* \

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1129&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Fri Jan 29 21:32:54 2010
@@ -3,6 +3,8 @@
   * Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
   * Fix symlinks in apache2-dbg package. Closes: #567076
   * Add new init script action graceful-stop (LP: #456381)
+  * Add a hook to apache2.2-common's postrm script that may come in handy
+    when upgrading to 2.4.
   * Make bug script also display php extensions.
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 09 Jan 2010 13:11:11 +0100