[Piuparts-commits] [piuparts] 01/01: fix some database related upgrade 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 4fdae4d19dd93432b32de8e9484f6310e68d2b87
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Oct 17 12:15:03 2015 +0200

    fix some database related upgrade paths
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 custom-scripts/scripts/pre_distupgrade_exceptions  | 12 ++++++++++++
 custom-scripts/scripts/pre_install_database-server | 14 ++++++++------
 master-bin/detect_piuparts_issues.in               |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/custom-scripts/scripts/pre_distupgrade_exceptions b/custom-scripts/scripts/pre_distupgrade_exceptions
index 2c2f38a..ea808d8 100755
--- a/custom-scripts/scripts/pre_distupgrade_exceptions
+++ b/custom-scripts/scripts/pre_distupgrade_exceptions
@@ -40,6 +40,18 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "wheezy" ]; then
 				;;
 	esac
 
+	# WORKSAROUND #698562: upgrade from squeeze => wheezy fails if database has not been created before the upgrade
+	case ${PIUPARTS_OBJECTS%%=*} in
+		pdns-backend-mysql)
+				log_debug
+				dpkg --purge pdns-backend-mysql
+				;;
+		pdns-backend-pgsql)
+				log_debug
+				dpkg --purge pdns-backend-pgsql
+				;;
+	esac
+
 	# WORKSAROUND #655969: lirc: prompting due to modified conffiles which where not modified by the user: /etc/lirc/hardware.conf
 	if [ -f /etc/lirc/hardware.conf ]; then
 		log_debug
diff --git a/custom-scripts/scripts/pre_install_database-server b/custom-scripts/scripts/pre_install_database-server
index 623e4f1..e4e2ece 100755
--- a/custom-scripts/scripts/pre_install_database-server
+++ b/custom-scripts/scripts/pre_install_database-server
@@ -8,12 +8,14 @@ set -e
 MYSQL=
 POSTGRESQL=
 SQLITE3=
+FUSIONFORGE=
+CLIENT=
 
 case ${PIUPARTS_OBJECTS%%=*} in
 	acidbase)				MYSQL=yes ;;
-	auth2db)				MYSQL=yes ;;
-	auth2db-common)				MYSQL=yes ;;
-	auth2db-frontend)			MYSQL=yes ;;
+	auth2db)				MYSQL=yes ; CLIENT=yes ;;
+	auth2db-common)				MYSQL=yes ; CLIENT=yes ;;
+	auth2db-frontend)			MYSQL=yes ; CLIENT=yes ;;
 	b2evolution)				MYSQL=yes ;;
 	bacula-director-mysql)			MYSQL=yes ;;
 	bacula-director-mysql-dbg)		MYSQL=yes ;;
@@ -181,8 +183,8 @@ case ${PIUPARTS_OBJECTS%%=*} in
 esac
 
 if [ "$FUSIONFORGE" = "yes" ]; then
-	case $PIUPARTS_DISTRIBUTION in
-		wheezy*|jessie)
+	case "$PIUPARTS_DISTRIBUTION" in
+		wheezy*|jessie|jessie/updates)
 			POSTGRESQL=yes
 			;;
 		*)
@@ -194,7 +196,7 @@ fi
 
 if [ "$MYSQL" = "yes" ]; then
 	echo "Installing mysql-server..."
-	apt-get -y install mysql-server
+	apt-get -y install mysql-server ${CLIENT:+mysql-client}
 fi
 
 if [ "$POSTGRESQL" = "yes" ]; then
diff --git a/master-bin/detect_piuparts_issues.in b/master-bin/detect_piuparts_issues.in
index 2dcd70f..ae838a5 100755
--- a/master-bin/detect_piuparts_issues.in
+++ b/master-bin/detect_piuparts_issues.in
@@ -59,6 +59,7 @@ for SECTION in $SECTIONS ; do
 		rgrep -l -i -e 'FATAL:  could not create shared memory segment: No space left on device' $MASTER/$SECTION/$subdir >> $FILE
 		rgrep -l -e 'No database found online on port 5432' $MASTER/$SECTION/$subdir >> $FILE
 		rgrep -l -e 'unable to connect to postgresql server' $MASTER/$SECTION/$subdir >> $FILE
+		rgrep -l -e 'psql: FATAL:  password authentication failed for user' $MASTER/$SECTION/$subdir >> $FILE
 		rgrep -l -e 'createuser: could not connect to database postgres: could not connect to server: No such file or directory' $MASTER/$SECTION/$subdir >> $FILE
 		rgrep -l -e 'Firebird .* server already running.' $MASTER/$SECTION/$subdir >> $FILE
 		find $MASTER/$SECTION/$subdir -name '*.log' -size 0 >> $FILE

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