From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Mon, 13 Feb 2012 12:06:23 +0000 (+0100)
Subject: Always cleanup diversion.
X-Git-Tag: debian/6.0.3~4
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=fb90ba1508784889f95c7795560c70d904bc60b9;p=carnet-upgrade.git

Always cleanup diversion.
---

diff --git a/src/functions.sh b/src/functions.sh
index deffe51..f85117d 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