[Box Backup-commit] COMMIT r2270 - box/trunk/infrastructure

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2008-09-06 11:44:47 +0100 (Sat, 06 Sep 2008)
New Revision: 2270

Modified:
   box/trunk/infrastructure/makebuildenv.pl.in
Log:
Don't try to kill daemons if not running, avoid error messages.


Modified: box/trunk/infrastructure/makebuildenv.pl.in
===================================================================
--- box/trunk/infrastructure/makebuildenv.pl.in	2008-09-06 10:41:18 UTC (rev 2269)
+++ box/trunk/infrastructure/makebuildenv.pl.in	2008-09-06 10:44:47 UTC (rev 2270)
@@ -419,7 +419,6 @@
 __E
 			}
 
-
 			print TESTFILE <<__E;
 echo Removing old test files...
 chmod -R a+rwx testfiles
@@ -444,9 +443,15 @@
 			if(-d "$module/testfiles")
 			{
 				print TESTFILE <<__E;
+
 # echo Killing any running daemons...
-test -r testfiles/bbackupd.pid && kill `cat testfiles/bbackupd.pid`
-test -r testfiles/bbstored.pid && kill `cat testfiles/bbstored.pid`
+test -r testfiles/bbackupd.pid \\
+&& kill -0 `cat testfiles/bbackupd.pid` \\
+&& kill `cat testfiles/bbackupd.pid`
+
+test -r testfiles/bbstored.pid \\
+&& kill -0 `cat testfiles/bbstored.pid` \\
+&& kill `cat testfiles/bbstored.pid`
 __E
 			}