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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 0ca62c5ca00a566899446ab8b7afc88b62ee6a79
Author: Michael Tautschnig <mt at debian.org>
Date:   Tue Apr 13 21:11:51 2010 +0200

    Make install conditional on existance of directory
    
    - closes: #550641
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 2ab0ec7..e583bf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ clamav (0.96+dfsg-2) unstable; urgency=low
   * Set milter's LogFile debconf option to a non-blank value; LogFile was
     implicitly enabled by default anyway through postinst logic; make LogTime
     default to sync with clamav-daemon (closes: #534748)
+  * Copy files from /usr/share/doc/clamav-base/examples/ only if this dir
+    exists (closes: #550641)
 
  -- Stephen Gran <sgran at debian.org>  Tue, 13 Apr 2010 19:21:18 +0200
 
diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index 02ac71e..e29ee2c 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -373,7 +373,8 @@ EOF
 
   # Update database now
   for db in main daily; do
-    if [ ! -e "$DATABASEDIR"/"$db".cvd ] && [ ! -d "$DATABASEDIR"/"$db".inc ] && [ ! -e "$DATABASEDIR"/"$db".cld ]; then
+    if [ ! -e "$DATABASEDIR"/"$db".cvd ] && [ ! -d "$DATABASEDIR"/"$db".inc ] && \
+      [ ! -e "$DATABASEDIR"/"$db".cld ] && [ -d /usr/share/doc/clamav-base/examples ] ; then
       install -m 0644 -o $user -g $user /usr/share/doc/clamav-base/examples/"$db".cvd \
         "$DATABASEDIR"
     fi

-- 
Debian repository for ClamAV