[Piuparts-commits] [piuparts] 01/03: adjust database upgrade and cleanup paths

[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 e11b24efeb9db2e0ab12fbcdd9ebbbf9ccdb976d
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Oct 6 15:07:08 2015 +0200

    adjust database upgrade and cleanup paths
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup | 2 ++
 custom-scripts/scripts/pre_distupgrade_zz_database-server   | 8 +++++++-
 debian/changelog                                            | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup b/custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
index e634479..3ee0e4f 100755
--- a/custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
+++ b/custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
@@ -75,7 +75,9 @@ if [ -d /var/lib/mysql ]; then
 	echo "mysql-server-5.1 mysql-server-5.1/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "mysql-server-5.5 mysql-server-5.5/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "mysql-server-5.6 mysql-server-5.6/postrm_remove_databases boolean true" | debconf-set-selections
+	# wrong template name is used in jessie
 	echo "mariadb-server-10.0 mysql-server-10.0/postrm_remove_databases boolean true" | debconf-set-selections
+	echo "mariadb-server-10.0 mariadb-server-10.0/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "percona-xtradb-cluster-server-5.5 mysql-server-5.1/postrm_remove_databases boolean true" | debconf-set-selections
 fi
 
diff --git a/custom-scripts/scripts/pre_distupgrade_zz_database-server b/custom-scripts/scripts/pre_distupgrade_zz_database-server
index 120a80c..35fe3e7 100755
--- a/custom-scripts/scripts/pre_distupgrade_zz_database-server
+++ b/custom-scripts/scripts/pre_distupgrade_zz_database-server
@@ -8,10 +8,16 @@ fi
 
 CANDIDATES=""
 CANDIDATES="$CANDIDATES mysql-server"
-CANDIDATES="$CANDIDATES mysql-server-5.5"
 CANDIDATES="$CANDIDATES postgresql"
 CANDIDATES="$CANDIDATES postgresql-8.4"
 CANDIDATES="$CANDIDATES postgresql-9.1"
+
+case "$PIUPARTS_DISTRIBUTION_NEXT" in
+	jessie)
+		CANDIDATES="$CANDIDATES mysql-server-5.5"
+		;;
+esac
+
 PACKAGES=""
 
 # early upgrade runs into even more trouble for some packages ...
diff --git a/debian/changelog b/debian/changelog
index 91d2792..55b1520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ piuparts (0.67) UNRELEASED; urgency=medium
     - Ensure /etc/mtab exists in the chroot.
   * scripts/post_distupgrade_exceptions:
     - Fix the /etc/nsswitch.conf wheezy -> jessie upgrade handling.
+  * Update custom scripts handling databases.
   * Add bug template for wheezy -> jessie -> stretch upgrades.
 
  -- Holger Levsen <holger at debian.org>  Wed, 26 Aug 2015 01:00:23 +0200

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