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

diff --git a/src/functions.sh b/src/functions.sh
index f5a0859..209d79a 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -147,7 +147,7 @@ remove_x() {
   LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75
   if [ $? -eq 0 ]; then
     log "Removing X Window System"
-    pkgrm x11-common
+    pkgrm xserver-xorg
   else
     log "Skipping X Window System removal"
   fi
@@ -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