X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=209d79aba5b861a58a3642c02f849545da7197d1;hb=225e91339e9f16cf7e96c3be59d41c3d2927d2f1;hp=deffe518a79456866117fc0b8dbbed5dbb0174a7;hpb=c114b9878b474e560c7b8bc0d4d91d68bf5e5fe1;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index deffe51..209d79a 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -793,9 +793,8 @@ apt_listchanges () {
                ;;
 
            enable)
-               if [ -f $file.disabled ]; then
-                   dpkg-divert --rename --remove $file || true
-               fi
+               # cleanup the diversion even if the file is already removed
+               dpkg-divert --rename --remove $file || true
                ;;
      esac
   done
@@ -829,15 +828,20 @@ is_orphaned () {
 
 # remove old and unused libraries
 remove_orphaned () {
-  local package
+  local package remove
 
   apt_autoremove
 
+  remove=
   for package in $orphaned_packages; do
     if is_orphaned $package; then
-      pkgrm $package
+      remove="$remove $package"
     fi
   done
+
+  if [ "$remove" ]; then
+    pkgrm $remove
+  fi
 }
 
 # monit it causing problems for postinst scripts