[apache2] 01/01: Close #711493: cut hides the exit status of grep. Thanks to jmv for providing a patch

[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 0f878d006845999dc34222eec2c6297f3f7048c2
Author: Arno Töll <arno at debian.org>
Date:   Sun Oct 27 18:42:18 2013 +0100

    Close #711493: cut hides the exit status of grep. Thanks to jmv for providing a patch
---
 debian/apache2.preinst |    4 ++--
 debian/changelog       |    9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/apache2.preinst b/debian/apache2.preinst
index c3e49c9..57be2b4 100644
--- a/debian/apache2.preinst
+++ b/debian/apache2.preinst
@@ -105,8 +105,8 @@ case "$1" in
 
 	# 1) an apache2-mpm package exists
 	if [ -d "/etc/apache2/" ] ; then
-		mpm=$(dpkg-query -f '${Package}\t${Status}\n'  -W 'apache2-mpm-*' 2>/dev/null) || true
-		if [ $? -eq 0 ] ; then
+	    	mpm=$(dpkg-query -f '${Package}\t${Status}\n'  -W 'apache2-mpm-*' 2>/dev/null | grep "install ok" | cut -f1)
+		if [ -n "$mpm" ] ; then
 			mpm=$(echo "$mpm" | grep "install ok" | cut -f1)
 			if [ ! -f /etc/apache2/.apache2_mpm_selected ] ; then
 				echo "# automatically created during upgrade" >> /etc/apache2/.apache2_mpm_selected
diff --git a/debian/changelog b/debian/changelog
index 1af4746..144cdc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 apache2 (2.4.6-4) UNRELEASED; urgency=low
 
+  [ Stefan Fritsch ]
   * In logrotate and init script, don't hardcode path to htcacheclean.
     Instead, put sbin directories in PATH. Also fix one missed reference
     to disk_cache.load, missed in 2.4.6-3. Really closes: #718909
@@ -7,7 +8,13 @@ apache2 (2.4.6-4) UNRELEASED; urgency=low
     This is no longer necessary with MPMs as modules.
   * Fix typo in serve-cgi-bin.conf. Closes: #723196
 
- -- Stefan Fritsch <sf at debian.org>  Sun, 01 Sep 2013 15:09:06 +0200
+  [ Arno Töll ]
+  * Fix "No default site enabled after fresh install if /etc/apache2
+    exists" by using a condition in preinst which actually works as expected.
+    Thanks to Jean-Michel Vourgère for triaging the issue and providing a
+    patch(Closes: #711493).
+
+ -- Arno Töll <arno at debian.org>  Sun, 27 Oct 2013 18:40:00 +0100
 
 apache2 (2.4.6-3) unstable; urgency=low
 

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