[debian-edu-commits] debian-edu/ 01/01: Move code to cleanup /usr/share/pam-configs/krb5 diversion from postinst to preinst to ease upgrades from old wheezy installations. (Closes: #779641)

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch jessie
in repository debian-edu-config.

commit 1e087a21fcfdaea950b31bdf02e62c3b9afabfa4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jul 17 16:52:39 2016 +0200

    Move code to cleanup /usr/share/pam-configs/krb5 diversion from postinst to preinst to ease upgrades from old wheezy installations. (Closes: #779641)
---
 debian/changelog                  | 5 +++++
 debian/debian-edu-config.postinst | 9 ---------
 debian/debian-edu-config.preinst  | 9 +++++++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f9b183..0aeec74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,11 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
   * testsuite/webserver: Dito (check presence of cert_override.txt in /etc/firefox-esr/,
     rather than /etc/firefox/).
 
+  [ Holger Levsen ]
+  * Move code to cleanup /usr/share/pam-configs/krb5 diversion from postinst
+    to preinst to ease upgrades from old wheezy installations.
+    (Closes: #779641)
+
  -- Holger Levsen <holger at debian.org>  Tue, 31 May 2016 11:23:33 +0200
 
 debian-edu-config (1.818+deb8u1) jessie; urgency=low
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index a0b192f..419bb36 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -136,15 +136,6 @@ if [ "$RET" = "false" ] ; then
 	fi
 fi
 
-# Remove now obsolete diverted config file as bug #656309 is fixed
-if [ configure = "$1" ] && \
-    dpkg --compare-versions "$2" le "1.726" && \
-    [ -h /usr/share/pam-configs/edu-krb5 ]; then
-    dpkg-divert --package debian-edu-config --remove /usr/share/pam-configs/krb5
-    rm /usr/share/pam-configs/edu-krb5
-    pam-auth-update --package --remove edu-krb5
-fi
-
 pam-auth-update --package
 
 # Some init-scripts fail if to many fd is open ??
diff --git a/debian/debian-edu-config.preinst b/debian/debian-edu-config.preinst
index d78ed68..405667f 100644
--- a/debian/debian-edu-config.preinst
+++ b/debian/debian-edu-config.preinst
@@ -49,6 +49,15 @@ upgrade)
 	rm_conffile debian-edu-config /etc/init.d/open-backdoor
     fi
 
+    # Remove now obsolete diverted config file as bug #656309 is fixed
+    # this is needed in preinst, see #779641
+    if dpkg --compare-versions "$2" le "1.726" && \
+      [ -h /usr/share/pam-configs/edu-krb5 ]; then
+        dpkg-divert --package debian-edu-config --remove /usr/share/pam-configs/krb5
+        rm /usr/share/pam-configs/edu-krb5
+        pam-auth-update --package --remove edu-krb5
+    fi
+
     ;;
 esac
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git