[SCM] Debian packaging for apache2 branch, next, updated. debian/2.4.4-2-15-g871e8e4
Arno Töll
arno at debian.org
Mon May 20 12:35:05 UTC 2013
The following commit has been merged in the next branch:
commit 871e8e44e9f6786c52df66149063f3fe5ee2bcbf
Author: Arno Töll <arno at debian.org>
Date: Mon May 20 14:34:58 2013 +0200
Also purge the state when the module was disabled by the site administrator
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index 87572f2..492fcdc 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -380,11 +380,13 @@ apache2_invoke()
apache2_msg "error" "apache2_invoke: $invoke_string $CONF not supported in $APACHE2_MAINTSCRIPT_NAME"
return 1
fi
- elif [ "$a2query_ret" -eq 33 ] ; then
+ elif [ "$a2query_ret" -eq 32 ] || [ "$a2query_ret" -eq 33 ] ; then
if [ "$APACHE2_MAINTSCRIPT_NAME" = 'postrm' ] && [ "$APACHE2_MAINTSCRIPT_METHOD" = "purge" ] ; then
apache2_msg "info" "apache2_invoke $APACHE2_MAINTSCRIPT_NAME: Purging state for $CONF"
# this will return RC=1
( a2$CMD -p -f -q "$CONF" > /dev/null 2>&1 )
+ else
+ apache2_msg "info" "apache2_invoke $CONF $APACHE2_MAINTSCRIPT_NAME: No action required"
fi
else
apache2_msg "info" "apache2_invoke $CONF $APACHE2_MAINTSCRIPT_NAME: No action required"
--
Debian packaging for apache2
More information about the Pkg-apache-commits
mailing list