[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

Török Edvin edwin at clamav.net
Sun Apr 4 01:06:04 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit 06a45187dbf1101dfdec9e386703165a8a239a13
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Sep 25 18:32:09 2009 +0300

    killclamd must always succeed (except when there's a stuck clamd).

diff --git a/unit_tests/check_common.sh b/unit_tests/check_common.sh
index a325876..ceb018e 100644
--- a/unit_tests/check_common.sh
+++ b/unit_tests/check_common.sh
@@ -22,8 +22,7 @@ killclamd() {
     sleep 9 &&
     kill -0 $pid 2>/dev/null &&
     echo "Killing stuck clamd!" &&
-    (kill -KILL $pid || true) &&
-    exit 109
+    kill -KILL $pid && exit 109 || true
 }
 
 error()

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list