X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=25ef535846d8451fed9f6ec18577a935068c98de;hb=5626b6c6fa1a7cd1c48e5aaff41a663ee98cb397;hp=d3bd0ded9c1ec0070fffed68d0084d52eb1f5278;hpb=774889a0e7cdb3a29dc62d6359e74e290ed76fde;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index d3bd0de..25ef535 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -479,13 +479,27 @@ restore_configs () {
   fi
 }
 
-# temporary remove listchanges packages to reduce clutter during upgrade
-disable_apt_listchanges () {
-  for p in apt-listchanges apt-listchanges-cn; do
-      if pkg $p; then
-          pkgrm $p
-          post_upgrade pkgadd $p
-      fi
+# temporary disable listchanges packages to reduce clutter during upgrade
+apt_listchanges () {
+  local file command=$1
+
+  for file in /etc/apt/apt.conf.d/20listchanges \
+              /etc/apt/apt.conf.d/20listchanges-cn
+  do
+      case $command in
+           disable)
+               if [ -f $file ]; then
+                   dpkg-divert --local --rename --divert $file.$backup_ext \
+                               --add $file || true
+               fi
+               ;;
+
+           enable)
+               if [ -f $file.$backup_ext ]; then
+                   dpkg-divert --remove $file || true
+               fi
+               ;;
+     esac
   done
 }