diff options
| author | Stefan Fritsch <sf@debian.org> | 2010-04-25 08:02:12 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:37:08 +0100 |
| commit | ae2bfde4068097b56fc0196ee7bcda412969de79 (patch) | |
| tree | b526f8790717f5bab667ebda60600778f2dba53d | |
| parent | b3b9888db9849883f25e32d8b8b3c0ae99d87b09 (diff) | |
| download | apache2-ae2bfde4068097b56fc0196ee7bcda412969de79.tar.gz | |
Silence the grep in preinst
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1191 01b336ce-410b-0410-9a02-a0e7f243c266
| -rw-r--r-- | debian/apache2.2-common.preinst | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/apache2.2-common.preinst b/debian/apache2.2-common.preinst index 222d15ee..03daca95 100644 --- a/debian/apache2.2-common.preinst +++ b/debian/apache2.2-common.preinst @@ -19,7 +19,7 @@ if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.15-4~ ; then # 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 diff --git a/debian/changelog b/debian/changelog index a65ba309..c377554a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apache2 (2.2.15-5) UNRELEASED; urgency=low + + * Silence the grep in preinst. + + -- Stefan Fritsch <sf@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 |