[Piuparts-commits] [piuparts] 02/02: drop manual mysql -> mariadb migration workaround
Holger Levsen
holger at layer-acht.org
Sat Jun 3 19:55:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master-for-0.77
in repository piuparts.
commit 41d7f67f210997e770aefbeb26cccba4f87a2043
Author: Andreas Beckmann <anbe at debian.org>
Date: Thu Jun 1 21:00:49 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 | 62 +---------------------
debian/changelog | 3 ++
2 files changed, 4 insertions(+), 61 deletions(-)
diff --git a/custom-scripts/scripts/pre_distupgrade_zz_database-server b/custom-scripts/scripts/pre_distupgrade_zz_database-server
index 6636183..c13b6a2 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,50 +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)
- SWITCH_TO_MARIADB=yes
- ;;
- openstack-cloud-services|\
- openstack-cloud-identity)
- SWITCH_TO_MARIADB=yes
- ;;
- pdns-backend-mysql)
- SWITCH_TO_MARIADB=yes
- ;;
- phpmyadmin)
- SWITCH_TO_MARIADB=yes
- ;;
- pnopaste)
- SWITCH_TO_MARIADB=yes
- ;;
- redmine-mysql)
- 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"
@@ -114,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 45959b1..f1edc38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ piuparts (0.77) UNRELEASED; urgency=medium
- Do not ignore Ctrl-C.
* scripts/post_distupgrade_base_cleanup: Remove (transitional) sysvinit from
stretch. (Closes: #860819)
+ * 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.
[ Holger Levsen ]
* piuparts-report.py:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git
More information about the Piuparts-commits
mailing list