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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 509e693dd90c2958caa0ae96158ca33993878dc1
Author: Stephen Gran <steve at lobefin.net>
Date:   Mon Jul 26 12:47:37 2010 +0100

    looks like we were comparing apples and oranges
    
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-freshclam.config.in b/debian/clamav-freshclam.config.in
index 21dc751..59d6fbc 100644
--- a/debian/clamav-freshclam.config.in
+++ b/debian/clamav-freshclam.config.in
@@ -49,7 +49,11 @@ if [ -n "$Checks" ]; then
   db_set clamav-freshclam/update_interval "$Checks" || true
 fi
 if [ -n "$NotifyClamd" ]; then
-  db_set clamav-freshclam/NotifyClamd "true" || true
+  if is_false "$NotifyClamd"; then
+    db_set clamav-freshclam/NotifyClamd "false" || true
+  else
+    db_set clamav-freshclam/NotifyClamd "true" || true
+  fi
 else
   db_set clamav-freshclam/NotifyClamd "false" || true
 fi
diff --git a/debian/clamav-freshclam.postinst.in b/debian/clamav-freshclam.postinst.in
index 7ff1a30..932e516 100644
--- a/debian/clamav-freshclam.postinst.in
+++ b/debian/clamav-freshclam.postinst.in
@@ -215,12 +215,11 @@ Bytecode $bytecode
 EOF
 
   if [ -n "$notify" ] ;then
-    if [ -n "$NotifyClamd" ] && is_true "$NotifyClamd"; then
-      echo "NotifyClamd $NotifyClamd" >> $DEBCONFILE
-    else
-      echo "NotifyClamd /etc/clamav/clamd.conf" >> $DEBCONFILE
-    fi
+    echo "NotifyClamd $notify" >> $DEBCONFILE
+  else
+    echo "NotifyClamd no" >> $DEBCONFILE
   fi
+
   if [ "$runas" != "cron" ] || [ "$runas" != "manual" ]; then
     if [ -n "$checks" ] && [ "$checks" != "true" ]; then
       echo "# Check for new database $checks times a day" >> $DEBCONFILE

-- 
Debian repository for ClamAV