X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Ffunctions.sh;h=0ddd941fabbbde73317fb6e41b081581497c86cc;hb=refs%2Ftags%2Fdebian%2F4.0.5;hp=0af728bf701decf0cbe1aadd0dfe5e9b1084cb6b;hpb=a97320a33fcf92f0c683b0830dbf700b88726a99;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 0af728b..0ddd941 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -678,10 +678,12 @@ upgrade_apache2 () {
 upgrade_amavis () {
   local conf
 
-  # remove init script diversion
-  if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
-    rm -vf /etc/init.d/amavis
-    dpkg-divert --quiet --remove /etc/init.d/amavis
+  # remove init script diversion before upgrade
+  if pkg amavisd-cn lt 3:2.4.2-4; then 
+    if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
+      rm -vf /etc/init.d/amavis
+      dpkg-divert --remove /etc/init.d/amavis
+    fi
   fi
 
   # move old config aside
@@ -699,6 +701,11 @@ upgrade_amavis () {
                 's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
                 /etc/init.d/amavisd-cn || true
 
+  # check if link got lost
+  if pkg amavisd-cn && [ ! -L /etc/init.d/amavis ]; then
+    apt-get install --reinstall --yes amavisd-cn
+  fi
+
   # start new packages
   /etc/init.d/amavis restart
 }
@@ -863,7 +870,7 @@ free_space() {
 download_size() {
   local size
   size=$(LC_ALL=C apt-get --yes --print-uris "$@" \
-         | sed -n '/^Need to get / {s///; s/B\/.*//; p}')
+         | sed -n '/^Need to get / {s///; s/B.*//; p}')
 
   size_to_mb "${size}B"
 }