[Piuparts-commits] [piuparts] 04/08: database package upgrade tuning

[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 36c3691b91e3afb9f008c902ab7eaf20dd614730
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Jan 24 05:53:26 2017 +0100

    database package upgrade tuning
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/pre_distupgrade_zz_database-server | 12 +++++++++++-
 custom-scripts/scripts/pre_install_database-server        |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/custom-scripts/scripts/pre_distupgrade_zz_database-server b/custom-scripts/scripts/pre_distupgrade_zz_database-server
index 40d9cf0..ba686ad 100755
--- a/custom-scripts/scripts/pre_distupgrade_zz_database-server
+++ b/custom-scripts/scripts/pre_distupgrade_zz_database-server
@@ -18,8 +18,8 @@ fi
 
 CANDIDATES=""
 CANDIDATES="$CANDIDATES default-mysql-server"
-CANDIDATES="$CANDIDATES mysql-server"
 CANDIDATES="$CANDIDATES postgresql"
+CANDIDATES="$CANDIDATES postgresql-8.3"
 CANDIDATES="$CANDIDATES postgresql-8.4"
 CANDIDATES="$CANDIDATES postgresql-9.1"
 CANDIDATES="$CANDIDATES postgresql-9.4"
@@ -31,6 +31,15 @@ case "$PIUPARTS_DISTRIBUTION_NEXT" in
 		;;
 esac
 
+case "$PIUPARTS_DISTRIBUTION_NEXT" in
+	stretch)
+		: # no mysql-server
+		;;
+	*)
+		CANDIDATES="$CANDIDATES mysql-server"
+		;;
+esac
+
 PACKAGES=""
 
 # early upgrade runs into even more trouble for some packages ...
@@ -72,6 +81,7 @@ upgrade_pg_cluster()
 
 	if ! is_installed postgresql-${to}
 	then
+		echo "Installing postgresql-${to}"
 		apt-get -y install postgresql-${to}
 	fi
 
diff --git a/custom-scripts/scripts/pre_install_database-server b/custom-scripts/scripts/pre_install_database-server
index 8b3ec01..258734e 100755
--- a/custom-scripts/scripts/pre_install_database-server
+++ b/custom-scripts/scripts/pre_install_database-server
@@ -108,6 +108,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	neutron-server)				SQLITE3=yes ;;
 	neutron-*-agent)			SQLITE3=yes ;;
 	nginx-naxsi-ui)				MYSQL=yes ;;
+	obs-api)				MYSQL=yes ;;
 	ocsinventory-reports)			MYSQL=yes ;;
 	ocsinventory-server)			MYSQL=yes ;;
 	openacs)				POSTGRESQL=yes ;;
@@ -188,7 +189,7 @@ esac
 
 if [ "$FUSIONFORGE" = "yes" ]; then
 	case "$PIUPARTS_DISTRIBUTION" in
-		wheezy*|jessie|jessie/updates)
+		wheezy*|jessie|jessie/updates|jessie-updates|jessie-proposed-updates)
 			POSTGRESQL=yes
 			;;
 		*)

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