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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 818f757885dae101763376d5777e26a53c8203d0
Author: Stephen Gran <steve at lobefin.net>
Date:   Mon May 3 10:41:58 2010 +0100

    only manipulate /etc/aliases on fresh install
    
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index e29ee2c..6d31e2d 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -42,6 +42,15 @@ case "$1" in
 	--shell /bin/false --group --home /var/lib/clamav clamav
     chown $user:$user $DATABASEDIR
     chown $user:$user $LOGDIR
+    if [ -f /etc/aliases ] || [ -L /etc/aliases ]; then
+      if ! grep -qi "^clamav" /etc/aliases; then
+        echo "clamav: root" >> /etc/aliases
+        newal=`which newaliases || true`
+        if [ -n "$newal" ] && [ -x "$newal" ]; then
+          $newal || true
+        fi
+      fi
+    fi
   else
     if [ -e '/etc/clamav/clamd.conf' ]; then # Upgrade - clamd.conf already there
       clamconf='/etc/clamav/clamd.conf'
@@ -51,16 +60,6 @@ case "$1" in
     fi
   fi
   
-  if [ -f /etc/aliases ] || [ -L /etc/aliases ]; then
-    if ! grep -qi "^clamav" /etc/aliases; then
-      echo "clamav: root" >> /etc/aliases
-      newal=`which newaliases || true`
-      if [ -n "$newal" ] && [ -x "$newal" ]; then
-        $newal || true
-      fi
-    fi
-  fi
-  
   if [ -n "$clamconf" ]; then 
     user="$(grep '^User ' $clamconf | awk '{print $2}')"
     [ -z "$user" ] && user=clamav # Old default config

-- 
Debian repository for ClamAV