[Piuparts-devel] [Git][debian/piuparts][master] 14 commits: Make a valid pkgsummary entry for an "invalid" pkg

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



Andreas Beckmann pushed to branch master at Debian / piuparts


Commits:
1474060d by David Steele at 2021-07-26T14:44:59+02:00
Make a valid pkgsummary entry for an "invalid" pkg

pkgsummary was assuming that package entries would never be made with an
"invalid" state. In that case, the entry would end up with the default
url "invalid url", which never should be the result. When an actual
package with an "invalid" state is entered, the eventual global summary
creation will fail on the bad url. Fix by always replacing a default
entry.

Test included.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
4f1448c6 by David Steele at 2021-07-26T14:45:04+02:00
Remove Python2 support from pkgsummary

six needs to die.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
c1aebaf9 by David Steele at 2021-07-26T14:45:09+02:00
Reformat pkgsummary

Fix some of the damage from 9096975.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
dbd289e0 by Andreas Beckmann at 2021-07-29T10:43:14+02:00
p-s.postinst: do not fail if no sshd is available on localhost:22

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

- - - - -
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>

- - - - -
3ffd18dc by Andreas Beckmann at 2021-08-03T12:26:22+02:00
p.conf: create bookworm tarballs

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

- - - - -
ab5fc149 by Andreas Beckmann at 2021-08-03T12:33:53+02:00
update configuration for stable=bullseye

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

- - - - -
46a18b94 by Andreas Beckmann at 2021-08-03T13:16:22+02:00
update examples for bullseye being stable and bookworm testing

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

- - - - -
5a46a367 by Andreas Beckmann at 2021-08-03T13:17:12+02:00
add myself to Uploaders

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

- - - - -
0c6cbbbf by Andreas Beckmann at 2021-08-03T13:18:54+02:00
release piuparts (1.1.4) to unstable

- - - - -


14 changed files:

- conf/distros.conf
- custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
- custom-scripts/scripts/pre_distupgrade_zz_database-server
- debian/changelog
- debian/control
- debian/piuparts-slave.postinst
- docs/README_server.txt
- docs/piuparts/piuparts.1.txt
- instances/piuparts.conf-template.pejacevic
- instances/piuparts.conf.anbe
- master-bin/detect_piuparts_issues.in
- piuparts.py
- piupartslib/pkgsummary.py
- tests/test_pkgsummary.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
@@ -176,19 +200,19 @@ target-release = experimental
 
 # alias
 [oldoldstable]
-distribution = jessie
+distribution = stretch
 
 # alias
 [oldstable]
-distribution = stretch
+distribution = buster
 
 # alias
 [stable]
-distribution = buster
+distribution = bullseye
 
 # alias
 [testing]
-distribution = bullseye
+distribution = bookworm
 
 
 # It's also possible to have "virtual" entries by setting uri to


=====================================
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
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,25 @@
+piuparts (1.1.4) unstable; urgency=medium
+
+  [ David Steele ]
+  * Make a valid pkgsummary entry for an "invalid" pkg.
+  * Remove Python2 support from pkgsummary.
+  * Reformat pkgsummary.
+
+  [ Andreas Beckmann ]
+  * piuparts.conf, distros.conf:
+    - Update for bullseye release.
+    - Create bookworm tarballs.
+    - Rename stretch-next to stretch-lts.
+  * docs/README_server.txt, docs/piuparts/piuparts.1.txt, piuparts.py:
+    Update examples for bullseye being stable and bookworm the new testing.
+  * piuparts-slave.postinst: Do not fail if no sshd is available on
+    localhost:22.
+  * scripts/pre_distupgrade_zz_database-server: bullseye/sid has postgresql-13
+    and mariadb-10.5.  (Closes: #988704)
+  * Add myself to Uploaders.
+
+ -- Andreas Beckmann <anbe at debian.org>  Tue, 03 Aug 2021 13:18:44 +0200
+
 piuparts (1.1.3) unstable; urgency=medium
 
   [ Michael Prokop ]


=====================================
debian/control
=====================================
@@ -1,6 +1,7 @@
 Source: piuparts
 Maintainer: piuparts developers team <piuparts-devel at alioth-lists.debian.net>
 Uploaders: Nicolas Dandrimont <olasd at debian.org>,
+ Andreas Beckmann <anbe at debian.org>,
  Holger Levsen <holger at debian.org>
 Section: devel
 Priority: optional


=====================================
debian/piuparts-slave.postinst
=====================================
@@ -49,7 +49,7 @@ if [ "$1" = "configure" ] ; then
     fi
 
     if [ ! -e $userhome/$suser/.ssh/known_hosts ] ; then
-        ssh-keyscan localhost > $userhome/$suser/.ssh/known_hosts 2>/dev/null
+        ssh-keyscan localhost > $userhome/$suser/.ssh/known_hosts 2>/dev/null || true
         chown $suser:$pgroup $userhome/$suser/.ssh/known_hosts
     fi
 


=====================================
docs/README_server.txt
=====================================
@@ -520,7 +520,7 @@ section, too, and will serve as defaults for all other sections
  distributions the slave should use for testing upgrades
  between distributions (i.e., Debian versions). Using "partial"
  distributions as defined in distros.conf is possible. Currently,
- "buster bullseye sid" is a good choice.
+ "bullseye bookworm sid" is a good choice.
  Setting this switches from doing install/purge tests to
  dist-upgrade tests. Not set by default.
 


=====================================
docs/piuparts/piuparts.1.txt
=====================================
@@ -65,7 +65,7 @@ Options must come before the other command line arguments.
   Bind-mount a directory inside the chroot.
 
 *-d* 'name', *-*-distribution*='name'::
-  Which Debian distribution to use: a code name (for example buster, bullseye or sid) or experimental. The default is sid (=unstable).
+  Which Debian distribution to use: a code name (for example bullseye, bookworm or sid) or experimental. The default is sid (=unstable).
 
 *-D* 'flavor', *-*-defaults*='flavor'::
   Use default settings suitable for a particular flavor of Debian: either debian or ubuntu. The default is debian.
@@ -356,10 +356,10 @@ If you want to do the same as above but for your changes files, pass in your cha
  piuparts -m 'http://gytha/debian main' ../foo_1.0-2_i386.changes
  ----
 
-If you want to test that a package installs properly in the stable (currently buster) Debian release, then can be upgraded to the testing (currently bullseye) and unstable (sid) versions, and then uninstalled without problems, you would give the following command::
+If you want to test that a package installs properly in the stable (currently bullseye) Debian release, then can be upgraded to the testing (currently bookworm) and unstable (sid) versions, and then uninstalled without problems, you would give the following command::
 
  ----
- piuparts -a -d buster -d bullseye -d sid foo
+ piuparts -a -d bullseye -d bookworm -d sid foo
  ----
 
 ENVIRONMENT


=====================================
instances/piuparts.conf-template.pejacevic
=====================================
@@ -31,12 +31,20 @@ flags-leftovers =
 	--scriptsdir /etc/piuparts/scripts-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-testing = %(flags-start-bookworm)s
+flags-end-testing = %(flags-end-bookworm)s
+flags-start-stable = %(flags-start-bullseye)s
+flags-end-stable = %(flags-end-bullseye)s
+flags-start-oldstable = %(flags-start-buster)s
+flags-end-oldstable = %(flags-end-buster)s
+
+# common flags for tests starting in bookworm
+flags-start-bookworm =
+# no flags needed
+
+# common flags for tests ending in bookworm
+flags-end-bookworm =
+# no flags needed
 
 # common flags for tests starting in bullseye
 flags-start-bullseye =
@@ -166,6 +174,7 @@ flags-broken-symlinks =
 basetgz-sections =
 	tarball/sid
 	tarball/sid-merged-usr
+	tarball/bookworm
 	tarball/bullseye
 	tarball/buster
 	tarball/stretch
@@ -233,7 +242,7 @@ sections =
 	squeeze2squeeze-lts
 	squeeze
 	lenny2squeeze
-testing-suite = bullseye
+testing-suite = bookworm
 mirror = @MIRROR@
 master-host = pejacevic.debian.org
 master-user = piupartsm
@@ -292,14 +301,24 @@ upgrade-test-distros = sid
 max-tgz-age = 259200
 
 
+[tarball/bookworm]
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+distro = None
+upgrade-test-distros = bookworm
+# 1 week (60*60*24*7)
+max-tgz-age = 604800
+
+
 [tarball/bullseye]
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-bullseye)s
 distro = None
 upgrade-test-distros = bullseye
-# 1 week (60*60*24*7)
-max-tgz-age = 604800
+# 1 month (60*60*24*30)
+max-tgz-age = 2592000
 
 
 [tarball/buster]
@@ -691,7 +710,7 @@ piuparts-flags =
 	%(flags-default)s
 	%(flags-start-stretch)s
 	%(flags-end-stretch)s
-distro = stretch-next
+distro = stretch-lts
 
 
 [stretch2next]
@@ -702,7 +721,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
=====================================
@@ -22,12 +22,15 @@ flags-leftovers =
 	--scriptsdir /etc/piuparts/scripts-leftovers
 
 flags-start-testing =
-	%(flags-start-bullseye)s
+	%(flags-start-bookworm)s
 flags-end-testing =
-	%(flags-end-bullseye)s
+	%(flags-end-bookworm)s
 
 flags-start-stable =
-	%(flags-start-stretch)s
+	%(flags-start-bullseye)s
+
+flags-start-bookworm =
+flags-end-bookworm =
 
 flags-start-bullseye =
 flags-end-bullseye =
@@ -120,6 +123,8 @@ basetgz-sections =
 	tarball/sid/i386
 	tarball/sid-merged-usr/amd64
 	tarball/sid-merged-usr/i386
+	tarball/bookworm/amd64
+	tarball/bookworm/i386
 	tarball/bullseye/amd64
 	tarball/bullseye/i386
 	tarball/buster/amd64
@@ -156,7 +161,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 +176,7 @@ sections =
 	testing2sid/main
 	stable2sid/main
 	stable2testing2sid/main
-	stretch2next/main
+	stretch2lts/main
 	stretch2buster/main
 	stretch3buster/main
 	stretch2buster_i386/main
@@ -222,7 +227,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 +242,7 @@ sections =
 	testing2sid/contrib
 	stable2sid/contrib
 	stable2testing2sid/contrib
-	stretch2next/contrib
+	stretch2lts/contrib
 	stretch2buster/contrib
 	stretch3buster/contrib
 	stretch2buster_i386/contrib
@@ -288,7 +293,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 +308,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
@@ -428,7 +433,7 @@ sections =
 	lenny2squeeze/non-free
 	lenny2squeeze_i386/non-free
 #
-testing-suite = bullseye
+testing-suite = bookworm
 #
 json-sections = none
 #
@@ -525,6 +530,33 @@ components = main
 max-tgz-age = 172800
 
 
+[tarball/bookworm/amd64]
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+distro = None
+upgrade-test-distros = bookworm
+arch = amd64
+area = main
+components = main
+# 60*60*24*7
+max-tgz-age = 604800
+
+
+[tarball/bookworm/i386]
+piuparts-flags =
+	%(flags-default)s
+	%(flags-start-bookworm)s
+distro = None
+upgrade-test-distros = bookworm
+arch = i386
+setarch = linux32
+area = main
+components = main
+# 60*60*24*7
+max-tgz-age = 604800
+
+
 [tarball/bullseye/amd64]
 piuparts-flags =
 	%(flags-default)s
@@ -534,8 +566,8 @@ upgrade-test-distros = bullseye
 arch = amd64
 area = main
 components = main
-# 60*60*24*7
-max-tgz-age = 604800
+# 60*60*24*30
+max-tgz-age = 2592000
 
 
 [tarball/bullseye/i386]
@@ -548,8 +580,8 @@ arch = i386
 setarch = linux32
 area = main
 components = main
-# 60*60*24*7
-max-tgz-age = 604800
+# 60*60*24*30
+max-tgz-age = 2592000
 
 
 [tarball/buster/amd64]
@@ -1499,39 +1531,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 +3318,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 +3333,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 +3348,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 +3365,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 +3381,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 +3397,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 +3449,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 +3461,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 +3473,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 +3488,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 +3503,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 +3518,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 +3533,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 +3546,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 +3559,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 +3575,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 +3591,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 +3607,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 +3623,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 +3637,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 +3651,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 +3667,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 +3683,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 +3699,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 +3716,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 +3731,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 +3746,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 +3763,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 +3780,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 +3797,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 +3813,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 +3827,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 +3841,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 +3855,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 +3867,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 +3879,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 +3893,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 +3908,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 +3923,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 +3940,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 +3956,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 +3972,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 +3987,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'
@@ -2710,7 +2711,7 @@ def parse_command_line():
 
     parser.add_option("-d", "--distribution", action="append", metavar="NAME",
                       help="Which Debian distribution to use: a code name " +
-                           "(for example buster, bullseye, sid) or experimental. The " +
+                           "(for example bullseye, bookworm, sid) or experimental. The " +
                            "default is sid (=unstable).")
 
     parser.add_option("-D", "--defaults", action="store",


=====================================
piupartslib/pkgsummary.py
=====================================
@@ -86,42 +86,59 @@ from collections import namedtuple, defaultdict
 import os
 
 
-import six
+INVALID_URL = "invalid url"
 
 
 class SummaryException(Exception):
     pass
 
+
 SUMMID = "Piuparts Package Test Results Summary"
 SUMMVER = "1.0"
 
-DEFSEC = 'overall'
+DEFSEC = "overall"
 
-FlagInfo = namedtuple('FlagInfo', ['word', 'priority', 'states'])
+FlagInfo = namedtuple("FlagInfo", ["word", "priority", "states"])
 
 flaginfo = {
-    'F': FlagInfo('Failed', 0, ["failed-testing"]),
-            'X': FlagInfo('Blocked', 1, [
-                          "cannot-be-tested",
-                          "dependency-failed-testing",
-                          "dependency-cannot-be-tested",
-                          "dependency-does-not-exist",
-                          ]),
-            'W': FlagInfo('Waiting', 2, [
-                          "waiting-to-be-tested",
-                          "waiting-for-dependency-to-be-tested",
-                          ]),
-            'P': FlagInfo('Passed', 3, [
-                          "essential-required",
-                          "successfully-tested",
-                          ]),
-            '-': FlagInfo('Unknown', 4, [
-                          "does-not-exist",
-                          "unknown",
-                          ]),
+    "F": FlagInfo("Failed", 0, ["failed-testing"]),
+    "X": FlagInfo(
+        "Blocked",
+        1,
+        [
+            "cannot-be-tested",
+            "dependency-failed-testing",
+            "dependency-cannot-be-tested",
+            "dependency-does-not-exist",
+        ],
+    ),
+    "W": FlagInfo(
+        "Waiting",
+        2,
+        [
+            "waiting-to-be-tested",
+            "waiting-for-dependency-to-be-tested",
+        ],
+    ),
+    "P": FlagInfo(
+        "Passed",
+        3,
+        [
+            "essential-required",
+            "successfully-tested",
+        ],
+    ),
+    "-": FlagInfo(
+        "Unknown",
+        4,
+        [
+            "does-not-exist",
+            "unknown",
+        ],
+    ),
 }
 
-state2flg = dict([(y, x[0]) for x in six.iteritems(flaginfo) for y in x[1].states])
+state2flg = dict([(y, x[0]) for x in flaginfo.items() for y in x[1].states])
 
 
 def worst_flag(*flags):
@@ -130,7 +147,7 @@ def worst_flag(*flags):
     except KeyError:
         raise SummaryException("Unknown flag in " + flags.__repr__())
 
-    return(flag)
+    return flag
 
 
 def get_flag(state):
@@ -139,7 +156,7 @@ def get_flag(state):
     except KeyError:
         raise SummaryException("Unknown state - " + state)
 
-    return(flag)
+    return flag
 
 
 def new_summary():
@@ -147,31 +164,34 @@ def new_summary():
     utcdate = " ".join(cdate_array[:-1] + ["UTC"] + [cdate_array[-1]])
 
     # define the packages struct. The default should never be the one added
-    dfltentry = ['-', 0, 'invalid url']
+    dfltentry = ["-", 0, INVALID_URL]
     pkgstruct = defaultdict(lambda: defaultdict(lambda: dfltentry))
 
-    return({
+    return {
         "_id": SUMMID,
-               "_version": SUMMVER,
-               "_date": utcdate,
-               "_comment": "Debian Piuparts Package Results - "
-                            "https://salsa.debian.org/debian/piuparts/raw/"
-                            "develop/piupartslib/pkgsummary.py",
-               "_type": "source",
-               "packages": pkgstruct,
-    })
+        "_version": SUMMVER,
+        "_date": utcdate,
+        "_comment": "Debian Piuparts Package Results - "
+        "https://salsa.debian.org/debian/piuparts/raw/"
+        "develop/piupartslib/pkgsummary.py",
+        "_type": "source",
+        "packages": pkgstruct,
+    }
 
 
 def add_summary(summary, rep_sec, pkg, flag, block_cnt, url):
-    if not flag in flaginfo or not isinstance(block_cnt, int) \
-            or not url.startswith('http'):
+    if (
+        not flag in flaginfo
+        or not isinstance(block_cnt, int)
+        or not url.startswith("http")
+    ):
         raise SummaryException("Invalid summary argument")
 
     pdict = summary["packages"]
 
     [old_flag, old_cnt, old_url] = pdict[pkg][rep_sec]
     block_cnt = max(block_cnt, old_cnt)
-    if old_flag != worst_flag(old_flag, flag):
+    if old_flag != worst_flag(old_flag, flag) or old_url == INVALID_URL:
         pdict[pkg][rep_sec] = [flag, block_cnt, url]
     else:
         pdict[pkg][rep_sec] = [old_flag, block_cnt, old_url]
@@ -194,9 +214,9 @@ def merge_summary(gbl_summ, sec_summ):
 def tooltip(summary, pkg):
     """Returns e.g. "Failed in testing and stable, blocking 5 packages"."""
 
-    tip = ''
+    tip = ""
 
-    pkgdict = summary['packages']
+    pkgdict = summary["packages"]
 
     if pkg in pkgdict:
         flag, block_cnt, url = pkgdict[pkg][DEFSEC]
@@ -207,42 +227,43 @@ def tooltip(summary, pkg):
         tip = flaginfo[flag].word
 
         if len(applicable) > 2:
-            tip += ' in ' + ', '.join(applicable[:-1]) + ' and ' + applicable[-1]
+            tip += " in " + ", ".join(applicable[:-1]) + " and " + applicable[-1]
         elif len(applicable) == 2:
-            tip += ' in ' + ' and '.join(applicable)
+            tip += " in " + " and ".join(applicable)
         elif len(applicable) == 1:
-            tip += ' in ' + applicable[0]
+            tip += " in " + applicable[0]
 
         if block_cnt:
             tip += ", blocking %d packages" % block_cnt
 
-        tip += '.'
+        tip += "."
 
     return tip
 
 
 def write_summary(summary, fname):
-    with open(fname + '.tmp', 'w') as fl:
+    with open(fname + ".tmp", "w") as fl:
         json.dump(summary, fl, sort_keys=True, indent=1)
-    os.rename(fname + '.tmp', fname)
+    os.rename(fname + ".tmp", fname)
 
 
 def read_summary(fname):
-    with open(fname, 'r') as fl:
+    with open(fname, "r") as fl:
         result = json.load(fl)
 
     if result["_id"] != SUMMID or result["_version"] != SUMMVER:
-        raise SummaryException('Summary JSON header mismatch')
+        raise SummaryException("Summary JSON header mismatch")
 
     return result
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     import sys
 
     # read a global summary file and return DDPO info by package
     summary = read_summary(sys.argv[1])
 
-    for pkg in summary['packages']:
-        flag, blocked, url = summary['packages'][pkg][DEFSEC]
+    for pkg in summary["packages"]:
+        flag, blocked, url = summary["packages"][pkg][DEFSEC]
 
         print(pkg, flag, url, tooltip(summary, pkg))


=====================================
tests/test_pkgsummary.py
=====================================
@@ -104,6 +104,11 @@ class PkgSummaryAddTests(unittest.TestCase):
         pkgsummary.add_summary(self.summ, 'dist', 'pkg', 'F', 2, 'http://foo')
         self.assertEqual(2, self.summ['packages']['pkg']['dist'][1])
 
+    def testSummAddInvalid(self):
+        pkgsummary.add_summary(self.summ, 'dist', 'pkg', '-', 0, 'http://foo')
+        print(self.summ['packages']['pkg']['dist'][2])
+        self.assertTrue("http" in self.summ['packages']['pkg']['dist'][2])
+
     def testSummMerge(self):
         pkgsummary.add_summary(self.summ, 'dist', 'pkg', 'X', 0, 'http://foo')
 



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/89182d0ca342b129efc5b2750230c0e6f97b8621...0c6cbbbf2c34bfd99f97a8ee6b32a4fcb1f85986

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/89182d0ca342b129efc5b2750230c0e6f97b8621...0c6cbbbf2c34bfd99f97a8ee6b32a4fcb1f85986
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/52c00b9a/attachment-0001.htm>


More information about the Piuparts-devel mailing list