rpms/squid/F-11 squid.logrotate,1.2,1.3 squid.spec,1.125,1.126

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31039

Modified Files:
	squid.logrotate squid.spec 
Log Message:
Bug #520445 silence logrotate when Squid is not running


Index: squid.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid.logrotate	9 Oct 2008 11:47:06 -0000	1.2
+++ squid.logrotate	1 Sep 2009 18:32:21 -0000	1.3
@@ -7,7 +7,8 @@
     sharedscripts
     postrotate
       # Asks squid to reopen its logs. (log_rotate 0 is set in squid.conf)
-      /usr/sbin/squid -k rotate
+      # errors redirected to make it silent if squid is not running
+      /usr/sbin/squid -k rotate 2>/dev/null
       # Wait a little to allow Squid to catch up before the logs is compressed
       sleep 1
     endscript


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -r1.125 -r1.126
--- squid.spec	4 Aug 2009 19:58:16 -0000	1.125
+++ squid.spec	1 Sep 2009 18:32:21 -0000	1.126
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE18
-Release:  1%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -341,6 +341,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep  1 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-3
+- Bug #520445 silence logrotate when Squid is not running
+
 * Tue Aug 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE18-1
 - Update to 3.0.STABLE18