[apache2] 01/02: Revert "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 annotated tag debian/2.4.10-10+deb8u3
in repository apache2.

commit c557d803fcfe7126a75744a03ba219e215e944c5
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Fri Aug 28 18:22:54 2015 +0200

    Revert "Fixed tests on deferred mpm switch (#789914)"
    
    The fix is at least not correct if mpm_itk is installed. Not sure if it
    make things worse.
    
    This reverts commit b84100da39d9546b9ce69cb7dad15214865eccd0.
    
    Conflicts:
       debian/changelog
---
 debian/apache2.postinst | 14 +++++++-------
 debian/changelog        |  7 +++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 6b82373..fb08c04 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -432,21 +432,21 @@ execute_deferred_actions ()
 			esac
 			;;
 		apache2_switch_mpm)
-			local MPM="$ARG1"
+			local MPM="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_$MPM.load ] ; then
-				msg "error" "mpm $MPM not found in 'apache2_switch_mpm $ARG1' for package $PACKAGE"
+			if [ ! -e /etc/apache2/mods-available/$MPM.load ] ; then
+				msg "error" "$MPM not found in 'apache2_switch_mpm $ARG1' for package $PACKAGE"
 				error=true
-			elif [ -e /etc/apache2/mods-enabled/mpm_$MPM.load ] ; then
-				msg "info" "Switch to mpm $MPM for package $PACKAGE: No action required"
+			elif [ ! -e /etc/apache2/mods-enabled/$MPM.load ] ; then
+				msg "info" "$MPM: No action required"
 			else
-				msg "info" "Switch to mpm $MPM for package $PACKAGE"
+				msg "info" "Switch to $MPM for package $PACKAGE"
 				if ! a2dismod -m -q "mpm_$CUR_MPM" ||
 				   ! a2enmod -m -q "mpm_$MPM"
 				then
-					msg "error" "Switching to mpm $MPM failed"
+					msg "error" "Switching to $MPM failed"
 					error=true
 				fi
 			fi
diff --git a/debian/changelog b/debian/changelog
index 7c26710..d6578a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.10-10+deb8u3) UNRELEASED; urgency=medium
+
+  * Revert fix for deferred mpm switch for now, because it is at least not
+    complete or maybe causes regressions (see #791902). Re-opens #789914
+
+ -- Stefan Fritsch <sf at debian.org>  Fri, 28 Aug 2015 18:12:51 +0200
+
 apache2 (2.4.10-10+deb8u2) jessie; urgency=medium
 
   [ Stefan Fritsch ]

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