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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 502b4bc6131325ca7d9a9e58e7a5ba2140b0197a
Author: Michael Tautschnig <mt at debian.org>
Date:   Sat Oct 30 23:12:02 2010 +0200

    Piuparts tells us that we should remove some more files
    
    - We did all this in case ucf was available, but piuparts removes that before
      removing clamav packages
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 4251b7c..2dc56cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+clamav (0.96.4+dfsg-2) UNRELEASED; urgency=low
+  
+  [ Michael Tautschnig ]
+  * Forcibly remove files in purge even if ucf is not available (anymore) -
+    thanks piuparts.
+  
+ -- Michael Tautschnig <mt at debian.org>  Sat, 30 Oct 2010 23:11:09 +0200
+
 clamav (0.96.4+dfsg-1) unstable; urgency=low
   
   [ Alberto WU ]
diff --git a/debian/clamav-daemon.postrm b/debian/clamav-daemon.postrm
index 1ec0224..1364df7 100644
--- a/debian/clamav-daemon.postrm
+++ b/debian/clamav-daemon.postrm
@@ -22,12 +22,12 @@ set -e
 
 case "$1" in
   purge)
+  LOGROTATE_FILE='/etc/logrotate.d/clamav-daemon'
   if [ -x "/usr/bin/ucf" ]; then
-    LOGROTATE_FILE='/etc/logrotate.d/clamav-daemon'
     ucf -p $LOGROTATE_FILE || true
-    if [ -e "$LOGROTATE_FILE" ]; then
-      rm -f $LOGROTATE_FILE
-    fi
+  fi
+  if [ -e "$LOGROTATE_FILE" ]; then
+    rm -f $LOGROTATE_FILE
   fi
   for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
     if [ -d "$dir" ]; then
diff --git a/debian/clamav-milter.postrm b/debian/clamav-milter.postrm
index 90af7be..8e669f2 100644
--- a/debian/clamav-milter.postrm
+++ b/debian/clamav-milter.postrm
@@ -22,18 +22,18 @@ set -e
 
 case "$1" in
   purge)
-  if [ -x "/usr/bin/ucf" ]; then
-    UCFLIST="/etc/clamav/clamav-milter.conf \
-      /var/lib/clamav/clamav-milter.conf \
-      /etc/logrotate.d/clamav-milter \
-      /var/lib/clamav/clamav-milter.rotate.debconf"
-    for i in $UCFLIST; do
+  UCFLIST="/etc/clamav/clamav-milter.conf \
+    /var/lib/clamav/clamav-milter.conf \
+    /etc/logrotate.d/clamav-milter \
+    /var/lib/clamav/clamav-milter.rotate.debconf"
+  for i in $UCFLIST; do
+    if [ -x "/usr/bin/ucf" ]; then
       ucf -p $i || true
-      if [ -e $i ]; then
-        rm -f $i || true
-      fi
-    done
-  fi
+    fi
+    if [ -e $i ]; then
+      rm -f $i
+    fi
+  done
   rm -f /var/log/clamav/clamav-milter.log* /etc/clamav/clamav-milter.conf.dpkg-old /etc/clamav/clamav-milter.conf.ucf-old
   for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
     if [ -d "$dir" ]; then

-- 
Debian repository for ClamAV