From 276d9fcc457daa657cd21585742cf30d6f8ab8c7 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 6 Sep 2008 10:44:47 +0000 Subject: Don't try to kill daemons if not running, avoid error messages. --- infrastructure/makebuildenv.pl.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in index 9daa67b7..3ceacb75 100755 --- a/infrastructure/makebuildenv.pl.in +++ b/infrastructure/makebuildenv.pl.in @@ -419,7 +419,6 @@ test -r testfiles/bbstored.pid && kill `cat testfiles/bbstored.pid` __E } - print TESTFILE <<__E; echo Removing old test files... chmod -R a+rwx testfiles @@ -444,9 +443,15 @@ __E 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 } -- cgit v1.2.3