[apache2] 05/06: Process actions in trigger states. #787103

[Jean-Michel Vourgère]

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

nirgal pushed a commit to branch master
in repository apache2.

commit 82f959d7f6ad7e57cea2e9d85cdb159b719e3c83
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Wed Nov 26 11:31:44 2014 +0000

    Process actions in trigger states. #787103
---
 debian/apache2.postinst                     | 2 +-
 debian/debhelper/apache2-maintscript-helper | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 010708c..e4863bd 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -132,7 +132,7 @@ execute_deferred_actions ()
 	cat /var/lib/apache2/deferred_actions |
 	while read PACKAGE FUNCTION ARG1 ARG2 ARG3
 	do
-		if ! dpkg-query -f '${Status}' -W "$PACKAGE"|grep -q installed ; then
+		if ! dpkg-query -f '${Status}' -W "$PACKAGE"|egrep -q 'installed|triggers-awaited|triggers-pending' ; then
 			# If the package has been removed again, skip the actions
 			continue
 		fi
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper
index 3726365..83b0f64 100644
--- a/debian/debhelper/apache2-maintscript-helper
+++ b/debian/debhelper/apache2-maintscript-helper
@@ -76,7 +76,7 @@ else
 	fi
 
 	APACHE2_MAINTSCRIPT_DEFER=
-	if ! dpkg-query -f '${Status}' -W apache2|grep -q installed; then
+	if ! dpkg-query -f '${Status}' -W apache2|egrep -q 'installed|triggers-awaited|triggers-pending'; then
 		echo "Package apache2 is not configured yet. Will defer actions by package $DPKG_MAINTSCRIPT_PACKAGE."
 		APACHE2_MAINTSCRIPT_DEFER=/var/lib/apache2/deferred_actions
 	fi

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