r2585 - in branches/1.2: . debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-03-10 08:30:29 +0100 (Mon, 10 Mar 2008)
New Revision: 2585

Modified:
   branches/1.2/
   branches/1.2/debian/varnish.logrotate
Log:
Merged revisions 2359 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2359 | ssm | 2008-01-22 09:28:18 +0100 (Tue, 22 Jan 2008) | 3 lines
  
  Debian packaging: Only reload varnishlog if it is running.
  (Debian bug #462029)
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2358,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2359,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583

Modified: branches/1.2/debian/varnish.logrotate
===================================================================
--- branches/1.2/debian/varnish.logrotate	2008-03-10 07:28:12 UTC (rev 2584)
+++ branches/1.2/debian/varnish.logrotate	2008-03-10 07:30:29 UTC (rev 2585)
@@ -4,6 +4,8 @@
   compress
   delaycompress
   postrotate
-    /usr/sbin/invoke-rc.d varnishlog reload > /dev/null
+    if /usr/bin/pgrep -P 1 varnishlog >/dev/null; then
+      /usr/sbin/invoke-rc.d varnishlog reload > /dev/null
+    fi
   endscript
 }