[Piuparts-commits] [piuparts] 07/14: improve database distupgrade handling

[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 0314a66185cf40fb811bd925ee90a45b209627d6
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Aug 14 07:15:21 2017 +0200

    improve database distupgrade handling
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../scripts-leftovers/pre_remove_preseed_cleanup   |  1 +
 .../scripts/pre_distupgrade_zz_database-server     | 24 +++++++++++-----------
 debian/changelog                                   |  3 +--
 master-bin/detect_piuparts_issues.in               |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup b/custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
index 40d8698..e01024e 100755
--- a/custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
+++ b/custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
@@ -8,6 +8,7 @@ log_debug() {
 dbconfig_enable_purge()
 {
 	log_debug
+	echo "Enabling dbconfig purge for $1."
 	echo "$1 $1${2+/$2}/dbconfig-remove boolean true" | debconf-set-selections
 	echo "$1 $1${2+/$2}/purge boolean true" | debconf-set-selections
 }
diff --git a/custom-scripts/scripts/pre_distupgrade_zz_database-server b/custom-scripts/scripts/pre_distupgrade_zz_database-server
index b9237aa..4dd8533 100755
--- a/custom-scripts/scripts/pre_distupgrade_zz_database-server
+++ b/custom-scripts/scripts/pre_distupgrade_zz_database-server
@@ -28,17 +28,6 @@ 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"
-CANDIDATES="$CANDIDATES postgresql-9.6"
-
-case "$PIUPARTS_DISTRIBUTION_NEXT" in
-	jessie)
-		CANDIDATES="$CANDIDATES mysql-server-5.5"
-		;;
-esac
 
 case "$PIUPARTS_DISTRIBUTION_NEXT" in
 	buster)
@@ -83,10 +72,20 @@ done
 
 test ! -x /usr/bin/pg_lsclusters || pg_lsclusters
 
+did_apt_get_update=
+apt_get_update()
+{
+	if [ -z "$did_apt_get_update" ]
+	then
+		apt-get update
+		did_apt_get_update=true
+	fi
+}
+
 if [ -n "$PACKAGES" ]
 then
 	echo "Upgrading early: ${PACKAGES# }"
-	apt-get update
+	apt_get_update
 	apt-get -y install $PACKAGES || $RETRY
 fi
 
@@ -104,6 +103,7 @@ upgrade_pg_cluster()
 	then
 		echo ""
 		echo "Installing: postgresql-${to}"
+		apt_get_update
 		apt-get -y install postgresql-${to}
 	fi
 
diff --git a/debian/changelog b/debian/changelog
index b9832e3..6f56c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,7 @@ piuparts (0.79) UNRELEASED; urgency=medium
     stretch (--install-recommends) reference chroot.
   * scripts/is_testable_uninstallable:
     - Skip and fail install of mini-buildd-{bld,rep} in squeeze.
-  * scripts/pre_distupgrade_zz_database-server: There is no 'mysql-server' in
-    buster.
+  * scripts/pre_distupgrade_zz_database-server: Improve some upgrade paths.
   * scripts/post_purge_exceptions:
     - Restore /usr/lib/sasl2/ disappearing on some jessie->stretch upgrades.
   * scripts/is_testable_uninstallable:
diff --git a/master-bin/detect_piuparts_issues.in b/master-bin/detect_piuparts_issues.in
index eee1c83..b0e68a7 100644
--- a/master-bin/detect_piuparts_issues.in
+++ b/master-bin/detect_piuparts_issues.in
@@ -61,8 +61,8 @@ add_pattern "passwd: Authentication token manipulation error"
 add_pattern "(chfn|groupadd|useradd): (cannot lock|failure while writing changes to) /etc/(group|gshadow|passwd|shadow|subuid)"
 add_pattern "(groupadd|useradd): (unable to lock|cannot rewrite) (group|password) file"
 # Database server issues.
-add_pattern 'invoke-rc.d: initscript mysql, action "(start|restart)" failed.'
-add_pattern 'invoke-rc.d: initscript postgresql, action "start" failed.'
+add_pattern 'INVOKE-RC.D: INITSCRIPT (MYSQL|POSTGRESQL|POSTGRESQL-8.3), ACTION "(RE)?START" FAILED.'
+add_pattern 'invoke-rc.d: initscript (mysql|postgresql|postgresql-8.3), action "(re)?start" failed.'
 add_pattern 'The PostgreSQL server failed to start.'
 add_pattern 'No database found online on port 5432'
 add_pattern 'unable to connect to postgresql server'

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