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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 510e67c4005086b2a59563d4d1169d8f251680ab
Author: Stephen Gran <steve at lobefin.net>
Date:   Mon Apr 12 22:53:08 2010 +0100

    a little tidy up to the Bytecode debconf logic
    
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index c3581ff..02ac71e 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -154,10 +154,12 @@ case "$1" in
     selfcheck="$RET"
     db_metaget clamav-base/Bytecode value || true
     bytecode="$RET"
-    db_metaget clamav-base/BytecodeSecurity value || true
-    bytecodesec="$RET"
-    db_metaget clamav-base/BytecodeTimeout value || true
-    bytecodetime="$RET"
+    if [ "$bytecode" = "true" ]; then
+      db_metaget clamav-base/BytecodeSecurity value || true
+      bytecodesec="$RET"
+      db_metaget clamav-base/BytecodeTimeout value || true
+      bytecodetime="$RET"
+    fi
 
     slurp_config "$CLAMAVCONF"
     
@@ -298,7 +300,6 @@ StructuredDataDetection $StructuredDataDetection
 CommandReadTimeout $CommandReadTimeout
 SendBufTimeout $SendBufTimeout
 MaxQueue $MaxQueue
-Bytecode $bytecode
 EOF
 
     if is_true "$StructuredDataDetection"; then
@@ -331,8 +332,8 @@ EOF
       echo "LogFileMaxSize $LogFileMaxSize" >> $DEBCONFFILE
     fi
 
-    if [ -n "$bytecode" ]; then
-      echo "Bytecode $bytecode" >> $DEBCONFFILE
+    echo "Bytecode $bytecode" >> $DEBCONFFILE
+    if is_true "$bytecode"; then
       echo "BytecodeSecurity $bytecodesec" >> $DEBCONFFILE
       echo "BytecodeTimeout $bytecodetime" >> $DEBCONFFILE
     fi

-- 
Debian repository for ClamAV