[Piuparts-devel] [Git][debian/piuparts][develop] 5 commits: pre_distupgrade_zz_database-server: bullseye has mariadb-10.5

Andreas Beckmann (@anbe) gitlab at salsa.debian.org
Tue Aug 17 00:56:16 BST 2021



Andreas Beckmann pushed to branch develop at Debian / piuparts


Commits:
78665af9 by Andreas Beckmann at 2021-08-03T11:25:03+02:00
pre_distupgrade_zz_database-server: bullseye has mariadb-10.5

Closes: #988704

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
a5c1f8e8 by Andreas Beckmann at 2021-08-03T11:32:35+02:00
pre_distupgrade_zz_database-server: bullseye has postgresql-13

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
37565cbe by Andreas Beckmann at 2021-08-03T11:47:20+02:00
distros.conf: add support for bullseye partial distros

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
a4f883f4 by Andreas Beckmann at 2021-08-03T11:55:58+02:00
distros.conf: rename stretch-next to stretch-lts

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -
b45ba7cf by Andreas Beckmann at 2021-08-03T12:25:37+02:00
p.conf: fix flags for stable=buster

Signed-off-by: Andreas Beckmann <anbe at debian.org>

- - - - -


7 changed files:

- conf/distros.conf
- custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
- custom-scripts/scripts/pre_distupgrade_zz_database-server
- instances/piuparts.conf-template.pejacevic
- instances/piuparts.conf.anbe
- master-bin/detect_piuparts_issues.in
- piuparts.py


Changes:

=====================================
conf/distros.conf
=====================================
@@ -111,11 +111,10 @@ depends = stretch
 uri = http://deb.debian.org/debian-debug
 depends = stretch
 
-# this is a full distro representing an upcoming (old-)stable point release
-[stretch-next]
+[stretch-lts]
 uri = None
-depends = stretch stretch/updates stretch-updates stretch-proposed-updates
-candidates = stretch stretch/updates stretch-proposed-updates
+depends = stretch stretch/updates
+candidates = stretch stretch/updates
 
 [stretch-backports]
 depends = stretch stretch/updates
@@ -155,9 +154,34 @@ depends = buster buster/updates buster-backports
 target-release = buster-backports-sloppy
 
 
+[bullseye-security]
+uri = http://security.debian.org
+depends = bullseye
+
+[bullseye-updates]
+depends = bullseye
+
 [bullseye-proposed-updates]
 depends = bullseye
 
+[bullseye-debug]
+uri = http://deb.debian.org/debian-debug
+depends = bullseye
+
+# this is a full distro representing an upcoming (old-)stable point release
+[bullseye-next]
+uri = None
+depends = bullseye bullseye-security bullseye-updates bullseye-proposed-updates
+candidates = bullseye bullseye-security bullseye-proposed-updates
+
+[bullseye-backports]
+depends = bullseye bullseye-security
+target-release = bullseye-backports
+
+[bullseye-backports-sloppy]
+depends = bullseye bullseye-security bullseye-backports
+target-release = bullseye-backports-sloppy
+
 
 [sid-debug]
 uri = http://deb.debian.org/debian-debug


=====================================
custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
=====================================
@@ -88,11 +88,13 @@ if [ -d /var/lib/mysql ]; then
 	echo "mysql-server-5.5 mysql-server-5.5/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "mysql-server-5.6 mysql-server-5.6/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "mysql-server-5.7 mysql-server-5.7/postrm_remove_databases boolean true" | debconf-set-selections
+	echo "mysql-server-8.0 mysql-server-8.0/postrm_remove_databases boolean true" | debconf-set-selections
 	# wrong template name is used in jessie
 	echo "mariadb-server-10.0 mysql-server-10.0/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "mariadb-server-10.0 mariadb-server-10.0/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "mariadb-server-10.1 mariadb-server-10.1/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "mariadb-server-10.3 mariadb-server-10.3/postrm_remove_databases boolean true" | debconf-set-selections
+	echo "mariadb-server-10.5 mariadb-server-10.5/postrm_remove_databases boolean true" | debconf-set-selections
 	echo "percona-xtradb-cluster-server-5.5 mysql-server-5.1/postrm_remove_databases boolean true" | debconf-set-selections
 fi
 


=====================================
custom-scripts/scripts/pre_distupgrade_zz_database-server
=====================================
@@ -57,8 +57,8 @@ case "$PIUPARTS_DISTRIBUTION_NEXT" in
 		CANDIDATES="$CANDIDATES postgresql-11"
 		;;
 	bullseye|sid)
-		CANDIDATES="$CANDIDATES mariadb-server-10.3"
-		CANDIDATES="$CANDIDATES postgresql-11"
+		CANDIDATES="$CANDIDATES mariadb-server-10.5"
+		CANDIDATES="$CANDIDATES postgresql-13"
 		;;
 esac
 
@@ -165,10 +165,10 @@ case "${PIUPARTS_DISTRIBUTION}:${PIUPARTS_DISTRIBUTION_NEXT}" in
 		upgrade_pg_cluster 9.6 11
 		;;
 	buster*:bullseye)
-		upgrade_pg_cluster 9.6 11
+		upgrade_pg_cluster 11 13
 		;;
 	buster:sid)
-		upgrade_pg_cluster 9.6 11
+		upgrade_pg_cluster 11 13
 		;;
 esac
 


=====================================
instances/piuparts.conf-template.pejacevic
=====================================
@@ -33,10 +33,10 @@ flags-leftovers =
 # aliases for the definitions below
 flags-start-testing = %(flags-start-bullseye)s
 flags-end-testing = %(flags-end-bullseye)s
-flags-start-stable = %(flags-start-stretch)s
-flags-end-stable = %(flags-end-stretch)s
-flags-start-oldstable = %(flags-start-jessie)s
-flags-end-oldstable = %(flags-end-jessie)s
+flags-start-stable = %(flags-start-buster)s
+flags-end-stable = %(flags-end-buster)s
+flags-start-oldstable = %(flags-start-stretch)s
+flags-end-oldstable = %(flags-end-stretch)s
 
 # common flags for tests starting in bullseye
 flags-start-bullseye =
@@ -691,7 +691,7 @@ piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-distro = stretch-next
+distro = stretch-lts
 
 
 [stretch2next]
@@ -702,7 +702,7 @@ piuparts-flags =
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
 distro = stretch
-upgrade-test-distros = stretch stretch-next
+upgrade-test-distros = stretch stretch-lts
 
 
 [jessie2stretch]


=====================================
instances/piuparts.conf.anbe
=====================================
@@ -27,7 +27,7 @@ flags-end-testing =
 	%(flags-end-bullseye)s
 
 flags-start-stable =
-	%(flags-start-stretch)s
+	%(flags-start-buster)s
 
 flags-start-bullseye =
 flags-end-bullseye =
@@ -156,7 +156,7 @@ sections =
 	buster-debug/main
 	stretch/main
 	stretch-rcmd/main
-	stretch-next/main
+	stretch-lts/main
 	stretch-security/main
 	stretch-updates/main
 	stretch-pu/main
@@ -171,7 +171,7 @@ sections =
 	testing2sid/main
 	stable2sid/main
 	stable2testing2sid/main
-	stretch2next/main
+	stretch2lts/main
 	stretch2buster/main
 	stretch3buster/main
 	stretch2buster_i386/main
@@ -222,7 +222,7 @@ sections =
 	buster-debug/contrib
 	stretch/contrib
 	stretch-rcmd/contrib
-	stretch-next/contrib
+	stretch-lts/contrib
 	stretch-security/contrib
 	stretch-updates/contrib
 	stretch-pu/contrib
@@ -237,7 +237,7 @@ sections =
 	testing2sid/contrib
 	stable2sid/contrib
 	stable2testing2sid/contrib
-	stretch2next/contrib
+	stretch2lts/contrib
 	stretch2buster/contrib
 	stretch3buster/contrib
 	stretch2buster_i386/contrib
@@ -288,7 +288,7 @@ sections =
 	buster-debug/non-free
 	stretch/non-free
 	stretch-rcmd/non-free
-	stretch-next/non-free
+	stretch-lts/non-free
 	stretch-security/non-free
 	stretch-updates/non-free
 	stretch-pu/non-free
@@ -303,7 +303,7 @@ sections =
 	testing2sid/non-free
 	stable2sid/non-free
 	stable2testing2sid/non-free
-	stretch2next/non-free
+	stretch2lts/non-free
 	stretch2buster/non-free
 	stretch3buster/non-free
 	stretch2buster_i386/non-free
@@ -1499,39 +1499,39 @@ arch = amd64
 area = non-free
 
 
-[stretch-next/main]
+[stretch-lts/main]
 precedence = 20
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-distro = stretch-next
+distro = stretch-lts
 arch = amd64
 area = main
 components = main
 reschedule-old-count = 500
 reschedule-old-days = 25
 
-[stretch-next/contrib]
+[stretch-lts/contrib]
 precedence = 45
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-depends-sections = stretch-next/main stretch-next/non-free
-distro = stretch-next
+depends-sections = stretch-lts/main stretch-lts/non-free
+distro = stretch-lts
 arch = amd64
 area = contrib
 reschedule-old-days = 25
 
-[stretch-next/non-free]
+[stretch-lts/non-free]
 precedence = 45
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-depends-sections = stretch-next/main stretch-next/contrib
-distro = stretch-next
+depends-sections = stretch-lts/main stretch-lts/contrib
+distro = stretch-lts
 arch = amd64
 area = non-free
 reschedule-old-days = 25
@@ -3286,7 +3286,7 @@ arch = amd64
 area = main
 components = main
 distro = wheezy-lts
-upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
+upgrade-test-distros = wheezy-lts jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3301,7 +3301,7 @@ depends-sections = wheezy222testing/main wheezy222testing/non-free
 arch = amd64
 area = contrib
 distro = wheezy-lts
-upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
+upgrade-test-distros = wheezy-lts jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3316,7 +3316,7 @@ depends-sections = wheezy222testing/main wheezy222testing/contrib
 arch = amd64
 area = non-free
 distro = wheezy-lts
-upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
+upgrade-test-distros = wheezy-lts jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3333,7 +3333,7 @@ setarch = linux32
 area = main
 components = main
 distro = wheezy-lts
-upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
+upgrade-test-distros = wheezy-lts jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3349,7 +3349,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = wheezy-lts
-upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
+upgrade-test-distros = wheezy-lts jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3365,7 +3365,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = wheezy-lts
-upgrade-test-distros = wheezy-lts jessie-lts stretch-next buster testing
+upgrade-test-distros = wheezy-lts jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3417,7 +3417,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch/contrib]
 precedence = 95
@@ -3429,7 +3429,7 @@ depends-sections = jessie2stretch/main jessie2stretch/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch/non-free]
 precedence = 95
@@ -3441,7 +3441,7 @@ depends-sections = jessie2stretch/main jessie2stretch/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 
 [jessie3stretch/main]
@@ -3456,7 +3456,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch/contrib]
@@ -3471,7 +3471,7 @@ depends-sections = jessie3stretch/main jessie3stretch/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch/non-free]
@@ -3486,7 +3486,7 @@ depends-sections = jessie3stretch/main jessie3stretch/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
@@ -3501,7 +3501,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch_i386/contrib]
 precedence = 95
@@ -3514,7 +3514,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch_i386/non-free]
 precedence = 95
@@ -3527,7 +3527,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 
 [jessie3stretch_i386/main]
@@ -3543,7 +3543,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch_i386/contrib]
@@ -3559,7 +3559,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch_i386/non-free]
@@ -3575,7 +3575,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
@@ -3591,7 +3591,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch-rcmd/contrib]
 precedence = 95
@@ -3605,7 +3605,7 @@ depends-sections = jessie2stretch-rcmd/main jessie2stretch-rcmd/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch-rcmd/non-free]
 precedence = 95
@@ -3619,7 +3619,7 @@ depends-sections = jessie2stretch-rcmd/main jessie2stretch-rcmd/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 
 [jessie3stretch-rcmd/main]
@@ -3635,7 +3635,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch-rcmd/contrib]
@@ -3651,7 +3651,7 @@ depends-sections = jessie3stretch-rcmd/main jessie3stretch-rcmd/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch-rcmd/non-free]
@@ -3667,7 +3667,7 @@ depends-sections = jessie3stretch-rcmd/main jessie3stretch-rcmd/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
@@ -3684,7 +3684,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch-rcmd_i386/contrib]
 precedence = 95
@@ -3699,7 +3699,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch-rcmd_i386/non-free]
 precedence = 95
@@ -3714,7 +3714,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 
 [jessie3stretch-rcmd_i386/main]
@@ -3731,7 +3731,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch-rcmd_i386/contrib]
@@ -3748,7 +3748,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 [jessie3stretch-rcmd_i386/non-free]
@@ -3765,7 +3765,7 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 exclude-known-problems = packages_have_been_kept_back_error.conf packages_have_been_kept_back_issue.conf
 
 
@@ -3781,7 +3781,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch-iri/contrib]
 precedence = 95
@@ -3795,7 +3795,7 @@ depends-sections = jessie2stretch-iri/main jessie2stretch-iri/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 [jessie2stretch-iri/non-free]
 precedence = 95
@@ -3809,7 +3809,7 @@ depends-sections = jessie2stretch-iri/main jessie2stretch-iri/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next
+upgrade-test-distros = jessie-lts stretch-lts
 
 
 [jessie2bpo2stretch/main]
@@ -3823,7 +3823,7 @@ distro = jessie-backports
 arch = amd64
 area = main
 components = main
-upgrade-test-distros = jessie-lts jessie-backports stretch-next
+upgrade-test-distros = jessie-lts jessie-backports stretch-lts
 
 [jessie2bpo2stretch/contrib]
 precedence = 95
@@ -3835,7 +3835,7 @@ depends-sections = jessie-lts/main jessie-lts/contrib jessie-lts/non-free jessie
 distro = jessie-backports
 arch = amd64
 area = contrib
-upgrade-test-distros = jessie-lts jessie-backports stretch-next
+upgrade-test-distros = jessie-lts jessie-backports stretch-lts
 
 [jessie2bpo2stretch/non-free]
 precedence = 95
@@ -3847,7 +3847,7 @@ depends-sections = jessie-lts/main jessie-lts/contrib jessie-lts/non-free jessie
 distro = jessie-backports
 arch = amd64
 area = non-free
-upgrade-test-distros = jessie-lts jessie-backports stretch-next
+upgrade-test-distros = jessie-lts jessie-backports stretch-lts
 
 
 [jessie222testing/main]
@@ -3861,7 +3861,7 @@ arch = amd64
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next buster testing
+upgrade-test-distros = jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3876,7 +3876,7 @@ depends-sections = jessie222testing/main jessie222testing/non-free
 arch = amd64
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next buster testing
+upgrade-test-distros = jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3891,7 +3891,7 @@ depends-sections = jessie222testing/main jessie222testing/contrib
 arch = amd64
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next buster testing
+upgrade-test-distros = jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3908,7 +3908,7 @@ setarch = linux32
 area = main
 components = main
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next buster testing
+upgrade-test-distros = jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3924,7 +3924,7 @@ arch = i386
 setarch = linux32
 area = contrib
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next buster testing
+upgrade-test-distros = jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
@@ -3940,12 +3940,12 @@ arch = i386
 setarch = linux32
 area = non-free
 distro = jessie-lts
-upgrade-test-distros = jessie-lts stretch-next buster testing
+upgrade-test-distros = jessie-lts stretch-lts buster testing
 max-reserved = 25
 reschedule-old-count = 100
 
 
-[stretch2next/main]
+[stretch2lts/main]
 precedence = 60
 piuparts-flags =
 	%(flags-default)s
@@ -3955,31 +3955,31 @@ arch = amd64
 area = main
 components = main
 distro = stretch
-upgrade-test-distros = stretch stretch-next
+upgrade-test-distros = stretch stretch-lts
 
-[stretch2next/contrib]
+[stretch2lts/contrib]
 precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-depends-sections = stretch2next/main stretch2next/non-free
+depends-sections = stretch2lts/main stretch2lts/non-free
 arch = amd64
 area = contrib
 distro = stretch
-upgrade-test-distros = stretch stretch-next
+upgrade-test-distros = stretch stretch-lts
 
-[stretch2next/non-free]
+[stretch2lts/non-free]
 precedence = 95
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-depends-sections = stretch2next/main stretch2next/contrib
+depends-sections = stretch2lts/main stretch2lts/contrib
 arch = amd64
 area = non-free
 distro = stretch
-upgrade-test-distros = stretch stretch-next
+upgrade-test-distros = stretch stretch-lts
 
 
 [stretch2buster/main]


=====================================
master-bin/detect_piuparts_issues.in
=====================================
@@ -69,7 +69,7 @@ add_pattern "(chfn|groupadd|useradd): (cannot lock|failure while writing changes
 add_pattern "(groupadd|useradd): (unable to lock|cannot rewrite) (group|password) file"
 # Database server issues.
 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 'invoke-rc.d: initscript (mariadb|mysql|postgresql|postgresql-8.3), action "(re)?start" failed.'
 add_pattern 'There is a MySQL server running, but we failed in our attempts to stop it.'
 add_pattern 'The PostgreSQL server failed to start.'
 add_pattern 'Is another postmaster already running on port 543.'


=====================================
piuparts.py
=====================================
@@ -1100,6 +1100,7 @@ class Chroot:
         full_name = self.relative("usr/sbin/policy-rc.d")
         policy = "#!/bin/sh\n"
         if settings.allow_database:
+            policy += 'test "$1" = "mariadb" && exit 0\n'
             policy += 'test "$1" = "mysql" && exit 0\n'
             policy += 'test "$1" = "postgresql" && exit 0\n'
             policy += 'test "$1" = "postgresql-8.3" && exit 0\n'



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/dbd289e01e547d1cdb3b99635cad2b14a2ff4028...b45ba7cf9c56b7e226bd351412b85fc3adeed1a4

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/dbd289e01e547d1cdb3b99635cad2b14a2ff4028...b45ba7cf9c56b7e226bd351412b85fc3adeed1a4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20210816/12bf02f4/attachment-0001.htm>


More information about the Piuparts-devel mailing list