[apache2] 01/06: Re-apply 'Fixed tests on deferred mpm switch'

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch jessie
in repository apache2.

commit 835316d9eaf0c83fa62f952ea3fa2f9d88ef627e
Author: Jean-Michel Vourgère <nirgal at debian.org>
Date:   Mon Jul 20 15:29:40 2015 +0200

    Re-apply 'Fixed tests on deferred mpm switch'
    
    Fixes for mpm_itk will come later
---
 debian/apache2.postinst | 14 +++++++-------
 debian/changelog        |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index fb08c04..6b82373 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -432,21 +432,21 @@ execute_deferred_actions ()
 			esac
 			;;
 		apache2_switch_mpm)
-			local MPM="mpm_$ARG1"
+			local MPM="$ARG1"
 			local CUR_MPM="$(ls /etc/apache2/mods-enabled/mpm_*.load)"
 			CUR_MPM="${CUR_MPM##*/mpm_}"
 			CUR_MPM="${CUR_MPM%.load}"
-			if [ ! -e /etc/apache2/mods-available/$MPM.load ] ; then
-				msg "error" "$MPM not found in 'apache2_switch_mpm $ARG1' for package $PACKAGE"
+			if [ ! -e /etc/apache2/mods-available/mpm_$MPM.load ] ; then
+				msg "error" "mpm $MPM not found in 'apache2_switch_mpm $ARG1' for package $PACKAGE"
 				error=true
-			elif [ ! -e /etc/apache2/mods-enabled/$MPM.load ] ; then
-				msg "info" "$MPM: No action required"
+			elif [ -e /etc/apache2/mods-enabled/mpm_$MPM.load ] ; then
+				msg "info" "Switch to mpm $MPM for package $PACKAGE: No action required"
 			else
-				msg "info" "Switch to $MPM for package $PACKAGE"
+				msg "info" "Switch to mpm $MPM for package $PACKAGE"
 				if ! a2dismod -m -q "mpm_$CUR_MPM" ||
 				   ! a2enmod -m -q "mpm_$MPM"
 				then
-					msg "error" "Switching to $MPM failed"
+					msg "error" "Switching to mpm $MPM failed"
 					error=true
 				fi
 			fi
diff --git a/debian/changelog b/debian/changelog
index 3c1be82..fb93657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ apache2 (2.4.10-10+deb8u4) UNRELEASED; urgency=medium
   * Add versioned replaces/breaks for libapache2-mod-macro to apache2,
     for the config files in /etc. Closes: #806326
   * Fix split-logfile to work with current perl. Closes: #803472
+  * Fixed tests on deferred mpm switch. Add special casing for mpm_itk,
+    which is not an mpm anymore, despite the name. Closes: #789914
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 28 Nov 2015 13:48:49 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git