[apache2] 03/03: Don't treat mpm_itk as MPM module in deferred actions

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit 5b11ffcaa11cd72e8a80beaa23d90c27bbb11f9b
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Oct 24 22:04:04 2015 +0200

    Don't treat mpm_itk as MPM module in deferred actions
---
 debian/apache2.postinst | 2 +-
 debian/changelog        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 1342a74..95884aa 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -152,7 +152,7 @@ execute_deferred_actions ()
 			;;
 		apache2_switch_mpm)
 			local MPM="$ARG1"
-			local CUR_MPM="$(ls /etc/apache2/mods-enabled/mpm_*.load)"
+			local CUR_MPM="$(ls /etc/apache2/mods-enabled/mpm_*.load | grep -e event -e prefork -e worker)"
 			CUR_MPM="${CUR_MPM##*/mpm_}"
 			CUR_MPM="${CUR_MPM%.load}"
 			if [ ! -e /etc/apache2/mods-available/mpm_$MPM.load ] ; then
diff --git a/debian/changelog b/debian/changelog
index 7489db8..97c1845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ apache2 (2.4.17-1) UNRELEASED; urgency=medium
   * Conflict with apache2.2-common and apache2.2-bin to get the transitional
     packages removed. Closes: #768815
   * Don't treat mpm_itk as MPM module in a2query. Closes: #791902
+  * Don't treat mpm_itk as MPM module in deferred actions in postinst.
+    Hopefully really closes: #789914
   * Don't treat mpm_itk as MPM module in a2enmod.
 
   [ Jean-Michel Vourgère ]

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