[Piuparts-commits] [piuparts] 02/05: scripts-jessie: make ucf fake-essential

[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 224cc17e61ef4f913e5f6e832d5cb15bbec74385
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Dec 2 00:55:25 2014 +0100

    scripts-jessie: make ucf fake-essential
    
    the few buggy packages haven't been fixed for jessie either :-(
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 .../post_setup_jessie-fake-essential               | 22 ++++++++++++++++++++++
 debian/changelog                                   |  3 +++
 instances/piuparts.conf.pejacevic                  |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential b/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential
new file mode 100755
index 0000000..98dc3e3
--- /dev/null
+++ b/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+# The following issues won't be fixed in jessie:
+#   - unconditional use of ucf during postrm purge
+# so add these packages to the "fake" essential set.
+USED_DURING_PURGE="ucf"
+
+
+case ${PIUPARTS_OBJECTS%%=*} in
+	dpkg)
+		# don't install fake essential packages while creating the tarball
+		exit 0
+		;;
+	ucf)
+		# allow testing of the fake essential packages
+		exit 0
+		;;
+esac
+
+echo "*** Adding fake essential packages ***"
+apt-get install -yf $USED_DURING_PURGE
diff --git a/debian/changelog b/debian/changelog
index a7d58dd..e55cf6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ piuparts (0.61) UNRELEASED; urgency=medium
   * lib/dwke.py: Fix parsing known_problems/*.conf using EXCLUDE_PATTERN.
   * piuparts.conf:
     - Add flags-start-jessie, flags-end-jessie global variables.
+    - Use --scriptsdir .../scripts-jessie for tests ending in jessie.
   * distros.conf:
     - Add *updates, *backports, *proposed for jessie.
     - Switch 'testing' alias to 'stretch', but deactivate it for stable.
@@ -40,6 +41,8 @@ piuparts (0.61) UNRELEASED; urgency=medium
   * pre_remove_40_find_unowned_lib_links, unowned_lib_symlink_*.conf: New
     script and reports for unowned symlinks in [/usr]/lib[/<triplet>].
   * post_distupgrade_exceptions: Handle libdb5.1 removal in jessie.
+  * scripts-jessie/post_setup_jessie-fake-essential: New custom script.
+    - Make ucf fake-essential. (ucf may be used unconditionally during purge.)
   * Rework the file-rc/sysvinit/upstart/systemd specific exceptions.
   * Update custom scripts handling databases, experimental, ... and some more.
   * Update bug templates.
diff --git a/instances/piuparts.conf.pejacevic b/instances/piuparts.conf.pejacevic
index 3d9cf91..eaa980e 100644
--- a/instances/piuparts.conf.pejacevic
+++ b/instances/piuparts.conf.pejacevic
@@ -35,6 +35,8 @@ flags-start-jessie =
 
 # common flags for tests ending in jessie
 flags-end-jessie =
+# extra fake-essential packages for successfully purging in jessie
+	--scriptsdir /etc/piuparts/scripts-jessie
 
 # common flags for tests starting in wheezy
 flags-start-wheezy =

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