[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-volatile, updated. debian/0.94.dfsg.1-1+volatile1-1-g485666e

[Michael Tautschnig]

The following commit has been merged in the debian/etch-volatile branch:
commit 485666ea7cde164674f96c8af5c7778d63327f4d
Author: Michael Tautschnig <mt at debian.org>
Date:   Sat Nov 22 17:44:55 2008 -0800

    Fix status_of_proc bug for etch
    
    - prepare next release
    - fix #506114 as suggested
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index c35fa03..e1a938a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clamav (0.94.dfsg.1-1~volatile2) etch-volatile; urgency=low
+
+  * Imitate the behavior of lsb's status_of_proc as this is not yet available
+    in etch (thanks Gregor Hoffleit) (closes: #506114)
+  
+ -- Michael Tautschnig <mt at debian.org>  Sat, 22 Nov 2008 17:44:40 -0800
+
 clamav (0.94.dfsg.1-1~volatile1) etch-volatile; urgency=low
 
   [ Stephen Gran ]
diff --git a/debian/clamav-daemon.init.in b/debian/clamav-daemon.init.in
index bfa3e10..75d0514 100644
--- a/debian/clamav-daemon.init.in
+++ b/debian/clamav-daemon.init.in
@@ -134,8 +134,15 @@ case "$1" in
   fi
   ;;
   status)
-  status_of_proc "$DAEMON" "$NAME"
-  exit $?
+  status="0"
+  pidofproc "$DAEMON" >/dev/null || status="$?"
+  if [ "$status" = 0 ]; then
+    log_success_msg "$NAME is running"
+    exit 0
+  else
+    log_failure_msg "$NAME is not running"
+    exit $status
+  fi
   ;;
   restart|force-reload)
   $0 stop

-- 
Debian repository for ClamAV