[Piuparts-commits] [piuparts] 04/04: drop manual mysql -> mariadb migration workaround

[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 238dc388865257cc7f487a847a3d043ee8e5966e
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Jun 1 23:10:38 2017 +0200

    drop manual mysql -> mariadb migration workaround
    
    mysql-transitional added a transitional mysql-server package to stretch
    that should take care of the migration to default-mysql-server
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../scripts/pre_distupgrade_zz_database-server     | 69 +---------------------
 debian/changelog                                   |  3 +
 2 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/custom-scripts/scripts/pre_distupgrade_zz_database-server b/custom-scripts/scripts/pre_distupgrade_zz_database-server
index 6e6d6bd..ab7d31a 100755
--- a/custom-scripts/scripts/pre_distupgrade_zz_database-server
+++ b/custom-scripts/scripts/pre_distupgrade_zz_database-server
@@ -26,6 +26,7 @@ retry_configure_pending()
 
 CANDIDATES=
 CANDIDATES="$CANDIDATES default-mysql-server"
+CANDIDATES="$CANDIDATES mysql-server"
 CANDIDATES="$CANDIDATES postgresql"
 CANDIDATES="$CANDIDATES postgresql-8.3"
 CANDIDATES="$CANDIDATES postgresql-8.4"
@@ -39,17 +40,7 @@ case "$PIUPARTS_DISTRIBUTION_NEXT" in
 		;;
 esac
 
-case "$PIUPARTS_DISTRIBUTION_NEXT" in
-	stretch)
-		: # no mysql-server
-		;;
-	*)
-		CANDIDATES="$CANDIDATES mysql-server"
-		;;
-esac
-
 PACKAGES=
-SWITCH_TO_MARIADB=
 RETRY="false"
 
 # early upgrade runs into even more trouble for some packages ...
@@ -62,57 +53,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
 		;;
 esac
 
-if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "stretch" ]; then
-	# recommended/suggested/related package mysql-server gets removed during dist-upgrade
-	case ${PIUPARTS_OBJECTS%%=*} in
-		bacula-director-mysql|\
-		bacula-director-mysql-dbg)
-			SWITCH_TO_MARIADB=yes
-			# (new) transitively recommended package mariadb-server-x.y gets
-			# configured (and the server started) too late (after ourselves)
-			RETRY="retry_configure_pending"
-			;;
-		bareos-database-mysql)
-			SWITCH_TO_MARIADB=yes
-			;;
-		icinga2-ido-mysql|\
-		icinga-web-config-icinga2-ido-mysql)
-			SWITCH_TO_MARIADB=yes
-			;;
-		openstack-cloud-services|\
-		openstack-cloud-identity)
-			SWITCH_TO_MARIADB=yes
-			;;
-		pdns-backend-mysql)
-			SWITCH_TO_MARIADB=yes
-			RETRY="retry_configure_pending"
-			;;
-		phpmyadmin)
-			SWITCH_TO_MARIADB=yes
-			;;
-		pnopaste)
-			SWITCH_TO_MARIADB=yes
-			;;
-		redmine-mysql)
-			SWITCH_TO_MARIADB=yes
-			;;
-		roundcube-core|\
-		roundcube|\
-		roundcube-plugins)
-			SWITCH_TO_MARIADB=yes
-			;;
-		tango-db|\
-		tango-db-dbg|\
-		tango-accesscontrol|\
-		tango-accesscontrol-dbg)
-			SWITCH_TO_MARIADB=yes
-			;;
-		yubikey-val)
-			SWITCH_TO_MARIADB=yes
-			;;
-	esac
-fi
-
 for pkg in $CANDIDATES
 do
 	if is_installed "$pkg"
@@ -121,13 +61,6 @@ do
 	fi
 done
 
-if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "stretch" ] && [ "$SWITCH_TO_MARIADB" = "yes" ]; then
-	if is_installed "mysql-server"
-	then
-		PACKAGES="$PACKAGES default-mysql-server mysql-server-"
-	fi
-fi
-
 test ! -x /usr/bin/pg_lsclusters || pg_lsclusters
 
 if [ -n "$PACKAGES" ]
diff --git a/debian/changelog b/debian/changelog
index 0363d2f..0d93ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,9 @@ piuparts (0.77) UNRELEASED; urgency=medium
   * scripts/post_{setup,distupgrade}_zz_backports: Avoid downgrading
     systemd/udev from jessie-backports to jessie during removal phase.
     (Closes: #856845)
+  * scripts/pre_distupgrade_zz_database-server: Do not migrate manually from
+    mysql-server to default-mysql-server (aka mariadb-server), there is now a
+    transitional mysql-server package in stretch.
   * scripts-broken-symlinks/post_install_extras_unbreak_symlinks: New script
     for "fixing" some broken symlinks (e.g. by installing selected suggested
     packages) in tests using --fail-on-broken-symlinks.

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