[Pkg-apache-commits] r1191 - in /trunk/apache2: apache2.2-common.preinst changelog

sf at alioth.debian.org sf at alioth.debian.org
Sun Apr 25 08:02:15 UTC 2010


Author: sf
Date: Sun Apr 25 08:02:12 2010
New Revision: 1191

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1191
Log:
Silence the grep in preinst

Modified:
    trunk/apache2/apache2.2-common.preinst
    trunk/apache2/changelog

Modified: trunk/apache2/apache2.2-common.preinst
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.preinst?rev=1191&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.preinst (original)
+++ trunk/apache2/apache2.2-common.preinst Sun Apr 25 08:02:12 2010
@@ -19,7 +19,7 @@
 	# apache2.conf to conf.d/other-vhosts-access-log. If the admin has
 	# removed it from apache2.conf, mark it to be disabled in
 	# conf.d/other-vhosts-access-log in the postinst.
-	if ! egrep '^ *CustomLog.*other_vhosts_access.log vhost_combined$' /etc/apache2/apache2.conf
+	if ! egrep -q '^ *CustomLog.*other_vhosts_access.log vhost_combined$' /etc/apache2/apache2.conf
 	then
 		touch /etc/apache2/disable-other-vhost-access-log.dpkg-apache2.2-common
 	fi

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1191&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun Apr 25 08:02:12 2010
@@ -1,3 +1,9 @@
+apache2 (2.2.15-5) UNRELEASED; urgency=low
+
+  * Silence the grep in preinst.
+
+ -- Stefan Fritsch <sf at debian.org>  Sun, 25 Apr 2010 10:01:03 +0200
+
 apache2 (2.2.15-4) unstable; urgency=low
 
   * Move definition of other_vhosts_access.log to new config file




More information about the Pkg-apache-commits mailing list