[apache2] 03/03: Allow 'apache2_invoke disconf' in postinst/preinst

[Arno Töll]

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

atoell-guest pushed a commit to branch master
in repository apache2.

commit 7bbd9734dcb2403505805301c94a6300d225f386
Author: Arno Töll <arno at debian.org>
Date:   Sat Nov 2 16:19:25 2013 +0100

    Allow 'apache2_invoke disconf' in postinst/preinst
---
 debian/changelog                            |    3 ++-
 debian/debhelper/apache2-maintscript-helper |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bfc992d..d686609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,9 @@ apache2 (2.4.6-4) UNRELEASED; urgency=low
   * Explicitly express the dependency for mod_access_compat depending on
     authn_core. Thanks Jean-Michel Vourgère for providing a patch (Closes:
     #710412)
+  * Allow "apache2_invoke disconf" in postinst/preinst (Closes: #717693)
 
- -- Arno Töll <arno at debian.org>  Sat, 02 Nov 2013 15:51:25 +0100
+ -- Arno Töll <arno at debian.org>  Sat, 02 Nov 2013 16:18:18 +0100
 
 apache2 (2.4.6-3) unstable; urgency=low
 
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index 50f3418..d7e77e3 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -328,6 +328,7 @@ apache2_switch_mpm()
 #	1 otherwise
 # Since: 2.4.1-3
 # Changes: 2.4.2-2: Added the second, optional argument
+#          2.4.6-4: Allow apache2_invoke to disable configuration in preinst/postinst
 apache2_invoke()
 {
 	local CMD=$1
@@ -398,7 +399,8 @@ apache2_invoke()
 					a2$CMD -p -f -q "$CONF" || return 1
 					apache2_msg "info" "apache2_invoke $APACHE2_MAINTSCRIPT_NAME: Purging $invoke_string $CONF"
 					APACHE2_NEED_ACTION=1
-				elif [ "$APACHE2_MAINTSCRIPT_NAME" = 'postrm' ] || [ "$APACHE2_MAINTSCRIPT_NAME" = 'prerm' ] ; then
+				elif [ "$APACHE2_MAINTSCRIPT_NAME" = 'postrm' ] || [ "$APACHE2_MAINTSCRIPT_NAME" = 'prerm' ] ||
+				    [ "$APACHE2_MAINTSCRIPT_NAME" = 'postinst' ] || [ "$APACHE2_MAINTSCRIPT_NAME" = 'preinst' ] ; then
 					if [ "$APACHE2_MAINTSCRIPT_METHOD" = "remove" ] ; then
 						a2$CMD -m -f -q "$CONF" || return 1
 						apache2_msg "info" "apache2_invoke $APACHE2_MAINTSCRIPT_NAME: Disable $invoke_string $CONF"

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