[Piuparts-commits] [piuparts] 07/07: remove pinentry-curses from stretch reference chroot

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 3123796663119cc043726e05ee667b5862bfaf68
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Aug 2 00:10:26 2017 +0200

    remove pinentry-curses from stretch reference chroot
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/post_distupgrade_base_cleanup | 6 ++++++
 debian/changelog                                     | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/custom-scripts/scripts/post_distupgrade_base_cleanup b/custom-scripts/scripts/post_distupgrade_base_cleanup
index 3e3dfdd..8e33783 100755
--- a/custom-scripts/scripts/post_distupgrade_base_cleanup
+++ b/custom-scripts/scripts/post_distupgrade_base_cleanup
@@ -68,6 +68,12 @@ if	[ "$PIUPARTS_DISTRIBUTION" = "stretch" ] || \
 	mark_for_purge libprocps3
 	mark_for_purge sysvinit
 
+	# pulled in during dist-upgrade of the reference chroot with --install-recommends
+	# can cause problems if the tested upgrade path installs a different pinentry-*
+	# because apt may fail to properly switch during removal (seen on e.g.
+	# plasma-desktop, plasma-netbook, kdeutils, print-manager, science-chemistry)
+	mark_for_purge pinentry-curses
+
 fi
 
 if [ -n "$PURGE" ]; then
diff --git a/debian/changelog b/debian/changelog
index 51c7453..f10fe45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ piuparts (0.79) UNRELEASED; urgency=medium
     - Add post_test_* custom scripts. These are run exactly once at the end
       of each test (before comparing with the reference chroot state).
   * Move some exceptions to {pre,post}_test_exceptions.
+  * scripts/post_distupgrade_base_cleanup: Remove pinentry-curses from the
+    stretch (--install-recommends) reference chroot.
 
  -- Holger Levsen <holger at debian.org>  Mon, 31 Jul 2017 13:35:18 -0400
 

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