[apache2] 04/04: Fixed tests on deferred mpm switch (#789914)

[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 b84100da39d9546b9ce69cb7dad15214865eccd0
Author: Jean-Michel Vourgère <nirgal at debian.org>
Date:   Mon Jul 20 15:29:40 2015 +0200

    Fixed tests on deferred mpm switch (#789914)
---
 debian/apache2.postinst | 14 +++++++-------
 debian/changelog        |  4 ++++
 2 files changed, 11 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 5bd0a21..6352d7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 apache2 (2.4.10-10+deb8u2) UNRELEASED; urgency=medium
 
+  [ Stefan Fritsch ]
   * core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts.
     This could cause all kinds of strange behavior. PR 56008. PR 57328
   * mpm_event: Fix process deadlock when shutting down a worker. PR 56960
   * mpm_event: Fix crashes due to various race conditions. Closes: #779078
 
+  [ Jean-Michel Vourgère ]
+  * apache2.postinst: Fixed tests on deferred mpm switch. Closes: #789914
+
  -- Stefan Fritsch <sf at debian.org>  Sat, 08 Aug 2015 22:02:39 +0200
 
 apache2 (2.4.10-10+deb8u1) jessie-security; urgency=medium

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