[Piuparts-devel] [Git][debian/piuparts][master] 24 commits: continue development...

Holger Levsen gitlab at salsa.debian.org
Mon Feb 11 11:55:18 GMT 2019


Holger Levsen pushed to branch master at Debian / piuparts


Commits:
af438cc8 by Holger Levsen at 2019-01-13T15:58:59Z
continue development...

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

- - - - -
e2d20077 by hpfn at 2019-01-27T18:53:42Z
Add '()' to print. Py2 and Py3 compatible

- - - - -
87d339fb by Holger Levsen at 2019-01-27T18:55:09Z
drop comment, we want to switch to python 3 anyway

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

- - - - -
2f67d80c by hpfn at 2019-01-31T15:01:38Z
piupartslib.dwke - memory

close #5

- - - - -
ac533808 by hpfn at 2019-02-05T19:27:18Z
make_kprs func - do not concat str, simplify 'if' statement

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

- - - - -
259ab12e by Holger Levsen at 2019-02-05T20:03:06Z
slave_bin: on stop, show what's keeping the slaves busy, to identify packages with a very long installation time.

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

- - - - -
a843ed38 by Holger Levsen at 2019-02-05T20:06:08Z
Makefile: include @sbindir@ in placeholder_substitution.

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

- - - - -
81f887da by Holger Levsen at 2019-02-05T20:08:16Z
improve output

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

- - - - -
43c6c1a2 by Holger Levsen at 2019-02-05T20:12:55Z
only show meaningful busyness

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

- - - - -
79ff4fa8 by Holger Levsen at 2019-02-06T09:49:44Z
fixup logic

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

- - - - -
3b4dedea by David Steele at 2019-02-06T11:14:00Z
Report results of stable2sid to DDPO

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

- - - - -
5c43fa0a by Holger Levsen at 2019-02-06T11:15:43Z
add changelog entry for David

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

- - - - -
ce65596f by David Steele at 2019-02-06T16:20:31Z
Swap stable2sid and stable22sid priorities

Promote the one reported to DDPO. It's currently stalled due to
the build of wheezy2jessie-lts.
- - - - -
aa1420f3 by Holger Levsen at 2019-02-06T16:25:14Z
add changelog entry for David

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

- - - - -
81d0c8e6 by Andreas Beckmann at 2019-02-08T22:47:52Z
eliminate backticks in favor of $()

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
b8cdef7b by Andreas Beckmann at 2019-02-08T22:47:52Z
stable->stable-proposed: upgrade database early

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
55bcc112 by Andreas Beckmann at 2019-02-08T22:47:52Z
p-r: do not count versions, we only have one per package

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
72a5a968 by Andreas Beckmann at 2019-02-08T22:47:53Z
p-r: report cruft in logfile lists

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
d5c417e2 by Andreas Beckmann at 2019-02-08T22:47:53Z
p-s: support prepending a setarch command to the piuparts invokation

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
6e88f415 by Andreas Beckmann at 2019-02-08T22:47:53Z
p.conf.anbe: set 'setarch = linux32' for all i386 tests

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
a22f843d by Andreas Beckmann at 2019-02-08T22:47:53Z
scripts-broken-symlinks: unbreak more symlinks

Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
4f2b29f5 by Holger Levsen at 2019-02-08T22:49:33Z
improve output

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

- - - - -
f3cc49da by Holger Levsen at 2019-02-11T09:31:15Z
instances/piuparts.conf-template.pejacevic: lower priorities of oldstable suites.

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

- - - - -
fc43352b by Holger Levsen at 2019-02-11T11:52:47Z
release as 0.97

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

- - - - -


21 changed files:

- Makefile
- README_server.txt
- custom-scripts/scripts-broken-symlinks/post_install_extras_unbreak_symlinks
- custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
- custom-scripts/scripts/pre_distupgrade_zz_database-server
- custom-scripts/scripts/pre_install_database-server
- debian/changelog
- instances/piuparts.conf-template.pejacevic
- instances/piuparts.conf.anbe
- master-bin/detect_archive_issues.in
- master-bin/detect_network_issues.in
- master-bin/detect_piuparts_issues.in
- master-bin/report_stale_reserved_packages.in
- master-bin/report_untestable_packages.in
- piuparts-analyze.py
- piuparts-report.py
- piuparts-slave.py
- piuparts.py
- piupartslib/dwke.py
- piupartslib/pkgsummary.py
- slave-bin/slave_stop.in


Changes:

=====================================
Makefile
=====================================
@@ -30,6 +30,7 @@ define placeholder_substitution
 	-e 's/__PIUPARTS_VERSION__/$(version)/g' \
 	-e 's%@libdir@%$(libdir)%g' \
 	-e 's%@sharedir@%$(sharedir)%g' \
+	-e 's%@sbindir@%$(sbindir)%g' \
 	$< > $@
 endef
 


=====================================
README_server.txt
=====================================
@@ -375,6 +375,10 @@ section, too, and will serve as defaults for all other sections
  used for logging stderr output from piuparts-master. This logfile
  will be placed in the 'master-directory' and has the PID appended.
 
+* "setarch" contains arguments for an optional 'setarch' command
+ that can be prepended to the 'piuparts-command'. Recommended value
+ for running 'i386' tests on an 'amd64' host is 'linux32'.
+
 * "piuparts-command" is the command the slave uses to start
  piuparts. It should include 'sudo' if necessary so that piuparts
  runs with sufficient priviledges to do its testing (and that


=====================================
custom-scripts/scripts-broken-symlinks/post_install_extras_unbreak_symlinks
=====================================
@@ -80,13 +80,13 @@ install_extra_package qflow			netgen-lvs
 # ruby-psych: Suggests: libpsych-java
 install_extra_package ruby-psych		libpsych-java
 
-# /usr/lib/slepcdir/slepc3.9/x86_64-linux-gnu-complex/share/slepc/datafiles -> ../../../../../../share/doc/libslepc3.9-dev-examples/datafiles
-# libslepc-complex3.9-dev: Suggests: libslepc3.9-dev-examples, slepc3.9-doc
-install_extra_package libslepc-complex3.9-dev	libslepc3.9-dev-examples slepc3.9-doc
+# /usr/lib/slepcdir/slepc3.10/x86_64-linux-gnu-complex/share/slepc/datafiles -> ../../../../../../share/doc/libslepc3.10-dev-examples/datafiles
+# libslepc-complex3.10-dev: Suggests: libslepc3.10-dev-examples
+install_extra_package libslepc-complex3.10-dev	libslepc3.10-dev-examples slepc3.10-doc
 
-# /usr/lib/slepcdir/slepc3.9/x86_64-linux-gnu-real/share/slepc/datafiles -> ../../../../../../share/doc/libslepc3.9-dev-examples/datafiles
-# libslepc-real3.9-dev: Suggests: libslepc3.9-dev-examples, slepc3.9-doc
-install_extra_package libslepc-real3.9-dev	libslepc3.9-dev-examples slepc3.9-doc
+# /usr/lib/slepcdir/slepc3.10/x86_64-linux-gnu-real/share/slepc/datafiles -> ../../../../../../share/doc/libslepc3.10-dev-examples/datafiles
+# libslepc-real3.10-dev: Suggests: libslepc3.10-dev-examples
+install_extra_package libslepc-real3.10-dev	libslepc3.10-dev-examples slepc3.10-doc
 
 # /usr/lib/wml/exec/wml_aux_weblint -> ../../../bin/weblint
 # /usr/lib/wml/exec/wml_aux_freetable -> ../../../bin/freetable
@@ -152,18 +152,22 @@ install_extra_package libembperl-perl		libjs-prototype
 # libgraphicsmagick1-dev: Suggests: graphicsmagick
 install_extra_package libgraphicsmagick1-dev	graphicsmagick
 
+# /usr/share/doc/libjs-mocha/example/chai.js -> ../../../javascript/chai/chai.js
+# libjs-mocha: Suggests: libjs-chai
+install_extra_package libjs-mocha		libjs-chai
+
 # /usr/share/doc/libjs-sprintf-js/examples/angular.min.js -> ../../../javascript/angular.js/angular.min.js
 # libjs-sprintf-js: Suggests: libjs-angularjs
 install_extra_package libjs-sprintf-js		libjs-angularjs
 
-# /usr/share/doc/libpetsc3.9-dev-examples/include -> ../petsc3.9-doc/include
-# /usr/share/doc/libpetsc3.9-dev-examples/docs -> ../petsc3.9-doc/docs
-# libpetsc3.9-dev-examples: Suggests: petsc3.9-doc
-install_extra_package libpetsc3.9-dev-examples	petsc3.9-doc
+# /usr/share/doc/libpetsc3.10-dev-examples/docs -> ../petsc3.10-doc/docs (libpetsc3.10-dev-examples)
+# /usr/share/doc/libpetsc3.10-dev-examples/include -> ../petsc3.10-doc/include (libpetsc3.10-dev-examples)
+# libpetsc3.10-dev-examples: Suggests: petsc3.10-doc
+install_extra_package libpetsc3.10-dev-examples	petsc3.10-doc
 
-# /usr/share/doc/libslepc3.9-dev-examples/examples/docs -> ../../slepc3.9-doc/docs
-# libslepc3.9-dev-examples: Suggests: slepc3.9-doc
-install_extra_package libslepc3.9-dev-examples	slepc3.9-doc
+# /usr/share/doc/libslepc3.10-dev-examples/examples/docs -> ../../slepc3.10-doc/docs
+# libslepc3.10-dev-examples: Suggests: slepc3.10-doc
+install_extra_package libslepc3.10-dev-examples	slepc3.10-doc
 
 # /usr/share/doc/libvirt-doc/changelog.gz -> ../libvirt0/changelog.gz
 install_extra_package libvirt-doc		libvirt0
@@ -171,6 +175,12 @@ install_extra_package libvirt-doc		libvirt0
 # /usr/share/doc/mkvtoolnix/README.source -> ../quilt/README.source
 install_extra_package mkvtoolnix		quilt nullmailer
 
+# /usr/share/doc/node-setimmediate/examples/chai.js -> ../../../javascript/chai/chai.js
+# /usr/share/doc/node-setimmediate/examples/mocha.css -> ../../../javascript/mocha/mocha.css
+# /usr/share/doc/node-setimmediate/examples/mocha.js -> ../../../javascript/mocha/mocha.js
+# node-setimmediate: Suggests: libjs-mocha, libjs-chai
+install_extra_package node-setimmediate		libjs-chai libjs-mocha
+
 # /usr/share/doc/python-ly/html -> ../python-ly-doc/html
 # python-ly: Suggests: python-ly-doc
 install_extra_package python-ly			python-ly-doc
@@ -234,6 +244,10 @@ install_extra_package org-mode			ditaa
 # python-biopython: Suggests: w3-dtd-mathml
 install_extra_package python-biopython		w3-dtd-mathml
 
+# /usr/lib/python2.7/dist-packages/sas/sasview/doc -> ../../../../../share/doc/sasview/html
+# python-sasview: Suggests: sasview-doc
+install_extra_package python-sasview		sasview-doc
+
 # /usr/share/pyshared/MoinMoin/words -> /etc/moin/words
 # /etc/moin/words -> /usr/share/dict/words
 install_extra_package python-moinmoin		wamerican
@@ -323,6 +337,11 @@ create_extra_file vdr				/var/cache/vdr/commands.conf /var/cache/vdr/reccmds.con
 # /etc/vdr/plugins/xineliboutput/config -> /var/lib/vdr/plugins/xineliboutput/config
 create_extra_file vdr-plugin-xineliboutput	/var/lib/vdr/plugins/xineliboutput/config
 
+# /usr/lib/mesa-diverted/i386-linux-gnu/libGLX_indirect.so.0 -> libGLX_mesa.so.0
+# /usr/lib/mesa-diverted/x86_64-linux-gnu/libGLX_indirect.so.0 -> libGLX_mesa.so.0
+create_extra_file glx-diversions		/usr/lib/mesa-diverted/i386-linux-gnu/libGLX_mesa.so.0
+create_extra_file glx-diversions		/usr/lib/mesa-diverted/x86_64-linux-gnu/libGLX_mesa.so.0
+
 # /usr/sbin/ganeti-masterd -> ../share/ganeti/default/ganeti-masterd
 # #857289
 create_extra_file ganeti			/usr/share/ganeti/default/ganeti-masterd


=====================================
custom-scripts/scripts-leftovers/pre_remove_preseed_cleanup
=====================================
@@ -88,6 +88,7 @@ if [ -d /var/lib/mysql ]; then
 	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 "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
=====================================
@@ -38,6 +38,28 @@ case "$PIUPARTS_DISTRIBUTION_NEXT" in
 		;;
 esac
 
+case "$PIUPARTS_DISTRIBUTION_NEXT" in
+	wheezy)
+		CANDIDATES="$CANDIDATES mysql-server-5.5"
+		CANDIDATES="$CANDIDATES postgresql-9.1"
+		;;
+	jessie)
+		CANDIDATES="$CANDIDATES mysql-server-5.5"
+		CANDIDATES="$CANDIDATES mariadb-server-10.0"
+		CANDIDATES="$CANDIDATES postgresql-9.4"
+		;;
+	stretch)
+		CANDIDATES="$CANDIDATES mariadb-server-10.1"
+		CANDIDATES="$CANDIDATES postgresql-9.6"
+		;;
+	buster)
+		CANDIDATES="$CANDIDATES mariadb-server-10.3"
+		CANDIDATES="$CANDIDATES postgresql-11"
+		;;
+esac
+
+
+
 PACKAGES=
 RETRY="false"
 


=====================================
custom-scripts/scripts/pre_install_database-server
=====================================
@@ -78,6 +78,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	heat-common)				SQLITE3=yes ;;
 	heat-engine)				SQLITE3=yes ;;
 	icinga-idoutils)			POSTGRESQL=yes ;;
+	icinga-idoutils-dbgsym)			POSTGRESQL=yes ;;
 	icinga-phpapi)				MYSQL=yes ;;
 	icinga-web)				POSTGRESQL=yes ;;
 	icinga-web-config-icinga)		POSTGRESQL=yes ;;
@@ -101,6 +102,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	moodle-book)				POSTGRESQL=yes ;;
 	moodle-debian-edu-*)			POSTGRESQL=yes ;;
 	movabletype-opensource)			SQLITE3=yes ;;
+	movim)					POSTGRESQL=yes ;;
 	mtop)					MYSQL=yes ;;
 	mythtv-database)			MYSQL=yes ;;
 	nagvis)					MYSQL=yes ;;


=====================================
debian/changelog
=====================================
@@ -1,3 +1,47 @@
+piuparts (0.97) unstable; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Ignore broken /var/lib/mender symlink.  (Closes: #915680)
+  * scripts/pre_distupgrade_zz_database-server: Also act on dist-upgrades
+    within a release, e.g. stable -> stable-proposed-updates.
+  * piuparts-slave.py:
+    - Support prepending a setarch command to the piuparts invocation.
+  * piuparts-report.py:
+    - Report [cruft] in logfile lists.
+
+  [ David Steele ]
+  * instances/piuparts.conf-template.pejacevic:
+    - report results of stable2sid to DDPO.
+    - swap stable2sid and stable22sid priorities, to promote the one reported
+      to DDPO.
+
+  [ Holger Levsen ]
+  * slave_bin: on stop, show what's keeping the slaves busy, to identify
+    packages with a very long installation time.
+  * Makefile: include @sbindir@ in placeholder_substitution.
+  * instances/piuparts.conf-template.pejacevic: lower priorities of oldstable
+    suites.
+
+  [ Herbert Fortes ]
+  * piuparts.py, piuparts-slave.py, piupartslib/pkgsummary.py and
+    piuparts-analyze.py: add '()' to print. Py2 and Py3 compatible.
+  * piupartslib/dwke.py:
+       - class Problem:
+           - Class attr instead of instance attr
+             Save some memory
+       - get_file_dict function:
+           - dictionary comprehension. "More readable and
+             often faster at the same time".
+       - create_problem_list function:
+            - list.sort() instead of sorted(list).
+              sorted() returns a *new* sorted list. This is
+              not necessary here.
+              list.sort() sorts the list in place.
+              Save some memory
+       - make_kprs function: do not concat str, simplify 'if' statement.
+
+ -- Holger Levsen <holger at debian.org>  Mon, 11 Feb 2019 12:30:10 +0100
+
 piuparts (0.96) unstable; urgency=medium
 
   [ Andreas Beckmann ]


=====================================
instances/piuparts.conf-template.pejacevic
=====================================
@@ -332,8 +332,7 @@ reschedule-old-count = 0
 
 
 [stable2sid]
-precedence = 10
-json-sections = none
+precedence = 4
 description = + Find possible issues before the package migrates to testing.
 piuparts-flags =
 	%(flags-default)s
@@ -343,7 +342,7 @@ upgrade-test-distros = stable sid
 
 
 [stable22sid]
-precedence = 4
+precedence = 5
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -353,7 +352,7 @@ upgrade-test-distros = stable testing sid
 
 
 [oldstable222sid]
-precedence = 5
+precedence = 6
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -363,7 +362,7 @@ upgrade-test-distros = oldstable stable testing sid
 
 
 [oldstable22testing]
-precedence = 6
+precedence = 7
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -407,7 +406,7 @@ upgrade-test-distros = stretch buster
 
 
 [stretch2buster-rcmd]
-precedence = 6
+precedence = 5
 json-sections = none
 description = + Testing with --install-recommends.
 piuparts-flags =
@@ -509,7 +508,7 @@ upgrade-test-distros = stretch stretch-proposed
 
 
 [jessie2stretch]
-precedence = 4
+precedence = 5
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -520,7 +519,7 @@ upgrade-test-distros = jessie stretch
 
 
 [jessie2Xstretch]
-precedence = 4
+precedence = 5
 json-sections = none
 description = + Testing two-stage upgrades.
 piuparts-flags =
@@ -585,7 +584,7 @@ upgrade-test-distros = jessie jessie-backports stretch
 
 
 [jessie2bpo]
-precedence = 5
+precedence = 6
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -597,7 +596,7 @@ upgrade-test-distros = jessie jessie-backports
 
 
 [jessie]
-precedence = 5
+precedence = 6
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-jessie)s
@@ -606,7 +605,7 @@ distro = jessie
 
 
 [jessie-rcmd]
-precedence = 5
+precedence = 6
 json-sections = none
 description = + With recommended packages.
 piuparts-flags =
@@ -618,7 +617,7 @@ distro = jessie
 
 
 [jessie-security]
-precedence = 2
+precedence = 3
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -629,7 +628,7 @@ distro = jessie/updates
 
 
 [jessie-pu]
-precedence = 4
+precedence = 5
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -640,7 +639,7 @@ distro = jessie-proposed-updates
 
 
 [jessie-lts]
-precedence = 4
+precedence = 5
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -650,7 +649,7 @@ distro = jessie-lts
 
 
 [jessie2lts]
-precedence = 4
+precedence = 5
 json-sections = none
 piuparts-flags =
 	%(flags-default)s


=====================================
instances/piuparts.conf.anbe
=====================================
@@ -80,6 +80,8 @@ flags-broken-symlinks =
 	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26231/exe
 	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26231/ns/mnt
 	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26231/ns/net
+	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26232/cwd
+	-i :/usr/share/gocode/src/github.com/prometheus/procfs/fixtures/26232/root
 # ignore broken symlinks
 	-i :/etc/systemd/system/display-manager.service
 #   civicrm-common, #857601, wontfix, /usr/share/civicrm/packages/OpenFlashChart/open-flash-chart.swf -> ../../../../local/open-flash-chart.swf
@@ -87,6 +89,10 @@ flags-broken-symlinks =
 #   musescore-common, #910145, wontfix, /usr/share/mscore-2.3/sound/{sf2,sfz} -> ../../sounds/{sf2,sfz}
 	-i :/usr/share/mscore-2.3/sound/sf2
 	-i :/usr/share/mscore-2.3/sound/sfz
+	-i :/usr/share/mscore-3.0/sound/sf2
+	-i :/usr/share/mscore-3.0/sound/sfz
+#   mender-client, #915680, /var/lib/mender -> /data/mender
+	-i :/var/lib/mender
 # ignore broken symlinks (patterns)
 	-I :/etc/.*/supervise
 	-I /usr/include/python2\.7_d/.*\.h
@@ -96,6 +102,7 @@ flags-broken-symlinks =
 	-I :/usr/share/doc/kde/HTML/.*/common
 	-I :/usr/share/man/man1/(.*-)?python.*-config\.1\.gz
 # ignore broken symlinks (third party game data)
+	-I :/usr/lib/openjk/JediAcademy/base/assets.\.pk3
 	-I :/usr/lib/rtcw/main/.*\.(cfg|pk3)
 
 [global]
@@ -460,6 +467,7 @@ piuparts-flags =
 distro = None
 upgrade-test-distros = sid
 arch = i386
+setarch = linux32
 area = main
 components = main
 # 60*60*24*2
@@ -486,6 +494,7 @@ piuparts-flags =
 distro = None
 upgrade-test-distros = buster
 arch = i386
+setarch = linux32
 area = main
 components = main
 # 60*60*24*7
@@ -512,6 +521,7 @@ piuparts-flags =
 distro = None
 upgrade-test-distros = stretch
 arch = i386
+setarch = linux32
 area = main
 components = main
 # 60*60*24*30
@@ -538,6 +548,7 @@ piuparts-flags =
 distro = None
 upgrade-test-distros = jessie
 arch = i386
+setarch = linux32
 area = main
 components = main
 # 60*60*24*30
@@ -563,6 +574,7 @@ piuparts-flags =
 distro = None
 upgrade-test-distros = wheezy
 arch = i386
+setarch = linux32
 area = main
 components = main
 max-tgz-age = 0
@@ -589,6 +601,7 @@ piuparts-flags =
 distro = None
 upgrade-test-distros = squeeze
 arch = i386
+setarch = linux32
 area = main
 components = main
 max-tgz-age = 0
@@ -615,6 +628,7 @@ piuparts-flags =
 distro = None
 upgrade-test-distros = lenny
 arch = i386
+setarch = linux32
 area = main
 components = main
 max-tgz-age = 0
@@ -664,6 +678,7 @@ piuparts-flags =
 depends-sections = sid-rcmd/main
 distro = experimental
 arch = i386
+setarch = linux32
 area = main
 components = main
 reschedule-old-days = 30
@@ -675,6 +690,7 @@ piuparts-flags =
 depends-sections = experimental_i386/main sid-rcmd/main sid-rcmd/contrib sid-rcmd/non-free
 distro = experimental
 arch = i386
+setarch = linux32
 area = contrib
 reschedule-old-days = 30
 
@@ -685,6 +701,7 @@ piuparts-flags =
 depends-sections = experimental_i386/main sid-rcmd/main sid-rcmd/contrib sid-rcmd/non-free
 distro = experimental
 arch = i386
+setarch = linux32
 area = non-free
 reschedule-old-days = 30
 
@@ -729,6 +746,7 @@ piuparts-flags =
 depends-sections = sid-rcmd/main
 distro = experimental
 arch = i386
+setarch = linux32
 area = main
 components = main
 
@@ -740,6 +758,7 @@ piuparts-flags =
 depends-sections = experimental-bl_i386/main sid-rcmd/main sid-rcmd/contrib sid-rcmd/non-free
 distro = experimental
 arch = i386
+setarch = linux32
 area = contrib
 
 [experimental-bl_i386/non-free]
@@ -750,6 +769,7 @@ piuparts-flags =
 depends-sections = experimental-bl_i386/main sid-rcmd/main sid-rcmd/contrib sid-rcmd/non-free
 distro = experimental
 arch = i386
+setarch = linux32
 area = non-free
 
 
@@ -832,6 +852,7 @@ piuparts-flags =
 	%(flags-default)s
 distro = sid
 arch = i386
+setarch = linux32
 area = main
 components = main
 reschedule-old-days = 60
@@ -845,6 +866,7 @@ piuparts-flags =
 depends-sections = sid-rcmd/main sid-rcmd/non-free
 distro = sid
 arch = i386
+setarch = linux32
 area = contrib
 reschedule-old-days = 60
 
@@ -857,6 +879,7 @@ piuparts-flags =
 depends-sections = sid-rcmd/main sid-rcmd/contrib
 distro = sid
 arch = i386
+setarch = linux32
 area = non-free
 reschedule-old-days = 60
 
@@ -899,6 +922,7 @@ piuparts-flags =
 	%(flags-broken-symlinks)s
 distro = sid
 arch = i386
+setarch = linux32
 area = main
 components = main
 
@@ -910,6 +934,7 @@ piuparts-flags =
 depends-sections = sid-bl_i386/main sid-bl_i386/non-free
 distro = sid
 arch = i386
+setarch = linux32
 area = contrib
 
 [sid-bl_i386/non-free]
@@ -920,6 +945,7 @@ piuparts-flags =
 depends-sections = sid-bl_i386/main sid-bl_i386/contrib
 distro = sid
 arch = i386
+setarch = linux32
 area = non-free
 
 
@@ -965,6 +991,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 distro = testing
 arch = i386
+setarch = linux32
 area = main
 components = main
 
@@ -979,6 +1006,7 @@ piuparts-flags =
 depends-sections = testing-rcmd/main testing-rcmd/non-free
 distro = testing
 arch = i386
+setarch = linux32
 area = contrib
 
 [testing-rcmd/non-free]
@@ -992,6 +1020,7 @@ piuparts-flags =
 depends-sections = testing-rcmd/main testing-rcmd/contrib
 distro = testing
 arch = i386
+setarch = linux32
 area = non-free
 
 
@@ -1005,6 +1034,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-no-usr-share-doc
 distro = testing
 arch = i386
+setarch = linux32
 area = main
 components = main
 
@@ -1019,6 +1049,7 @@ piuparts-flags =
 depends-sections = testing-nodocs/main testing-nodocs/non-free
 distro = testing
 arch = i386
+setarch = linux32
 area = contrib
 
 [testing-nodocs/non-free]
@@ -1032,6 +1063,7 @@ piuparts-flags =
 depends-sections = testing-nodocs/main testing-nodocs/contrib
 distro = testing
 arch = i386
+setarch = linux32
 area = non-free
 
 
@@ -1192,6 +1224,7 @@ piuparts-flags =
 	%(flags-end-stretch)s
 distro = stretch
 arch = i386
+setarch = linux32
 area = main
 components = main
 reschedule-old-count = 100
@@ -1207,6 +1240,7 @@ piuparts-flags =
 depends-sections = stretch-rcmd/main stretch-rcmd/non-free
 distro = stretch
 arch = i386
+setarch = linux32
 area = contrib
 
 [stretch-rcmd/non-free]
@@ -1220,6 +1254,7 @@ piuparts-flags =
 depends-sections = stretch-rcmd/main stretch-rcmd/contrib
 distro = stretch
 arch = i386
+setarch = linux32
 area = non-free
 
 
@@ -1484,6 +1519,7 @@ piuparts-flags =
 	%(flags-end-jessie)s
 distro = jessie
 arch = i386
+setarch = linux32
 area = main
 components = main
 reschedule-old-count = 100
@@ -1499,6 +1535,7 @@ piuparts-flags =
 depends-sections = jessie-rcmd/main jessie-rcmd/non-free
 distro = jessie
 arch = i386
+setarch = linux32
 area = contrib
 
 [jessie-rcmd/non-free]
@@ -1512,6 +1549,7 @@ piuparts-flags =
 depends-sections = jessie-rcmd/main jessie-rcmd/contrib
 distro = jessie
 arch = i386
+setarch = linux32
 area = non-free
 
 
@@ -1670,6 +1708,7 @@ piuparts-flags =
 	%(flags-end-wheezy)s
 distro = wheezy
 arch = i386
+setarch = linux32
 area = main
 components = main
 reschedule-old-count = 0
@@ -1685,6 +1724,7 @@ piuparts-flags =
 depends-sections = wheezy-rcmd/main wheezy-rcmd/non-free
 distro = wheezy
 arch = i386
+setarch = linux32
 area = contrib
 reschedule-old-count = 0
 
@@ -1699,6 +1739,7 @@ piuparts-flags =
 depends-sections = wheezy-rcmd/main wheezy-rcmd/contrib
 distro = wheezy
 arch = i386
+setarch = linux32
 area = non-free
 reschedule-old-count = 0
 
@@ -1860,6 +1901,7 @@ piuparts-flags =
 	%(flags-end-squeeze)s
 distro = squeeze
 arch = i386
+setarch = linux32
 area = main
 components = main
 reschedule-old-count = 0
@@ -1873,6 +1915,7 @@ piuparts-flags =
 depends-sections = squeeze_i386/main squeeze_i386/non-free
 distro = squeeze
 arch = i386
+setarch = linux32
 area = contrib
 reschedule-old-count = 0
 
@@ -1885,6 +1928,7 @@ piuparts-flags =
 depends-sections = squeeze_i386/main squeeze_i386/contrib
 distro = squeeze
 arch = i386
+setarch = linux32
 area = non-free
 reschedule-old-count = 0
 
@@ -2048,6 +2092,7 @@ piuparts-flags =
 	%(flags-end-lenny)s
 distro = lenny
 arch = i386
+setarch = linux32
 area = main
 components = main
 reschedule-old-count = 0
@@ -2061,6 +2106,7 @@ piuparts-flags =
 depends-sections = lenny_i386/main lenny_i386/non-free
 distro = lenny
 arch = i386
+setarch = linux32
 area = contrib
 reschedule-old-count = 0
 
@@ -2073,6 +2119,7 @@ piuparts-flags =
 depends-sections = lenny_i386/main lenny_i386/contrib
 distro = lenny
 arch = i386
+setarch = linux32
 area = non-free
 reschedule-old-count = 0
 
@@ -2221,6 +2268,7 @@ piuparts-flags =
 	%(flags-start-lenny)s
 	%(flags-end-testing)s
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = lenny
@@ -2237,6 +2285,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 depends-sections = lenny222testing_i386/main lenny222testing_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = lenny
 upgrade-test-distros = lenny squeeze wheezy jessie stretch testing
@@ -2250,6 +2299,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 depends-sections = lenny222testing_i386/main lenny222testing_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = lenny
 upgrade-test-distros = lenny squeeze wheezy jessie stretch testing
@@ -2266,6 +2316,7 @@ piuparts-flags =
 depends-sections = squeeze/main
 distro = squeeze-lts
 arch = i386
+setarch = linux32
 area = main
 components = main
 upgrade-test-distros = squeeze squeeze-lts wheezy
@@ -2281,6 +2332,7 @@ piuparts-flags =
 depends-sections = squeeze/main squeeze2lts2wheezy/main squeeze2lts2wheezy/non-free
 distro = squeeze-lts
 arch = i386
+setarch = linux32
 area = contrib
 upgrade-test-distros = squeeze squeeze-lts wheezy
 reschedule-old-count = 0
@@ -2295,6 +2347,7 @@ piuparts-flags =
 depends-sections = squeeze/main squeeze2lts2wheezy/main squeeze2lts2wheezy/contrib
 distro = squeeze-lts
 arch = i386
+setarch = linux32
 area = non-free
 upgrade-test-distros = squeeze squeeze-lts wheezy
 reschedule-old-count = 0
@@ -2390,6 +2443,7 @@ piuparts-flags =
 	%(flags-end-wheezy)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = squeeze
@@ -2404,6 +2458,7 @@ piuparts-flags =
 	%(flags-end-wheezy)s
 depends-sections = squeeze2wheezy_i386/main squeeze2wheezy_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = squeeze
 upgrade-test-distros = squeeze wheezy
@@ -2417,6 +2472,7 @@ piuparts-flags =
 	%(flags-end-wheezy)s
 depends-sections = squeeze2wheezy_i386/main squeeze2wheezy_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = squeeze
 upgrade-test-distros = squeeze wheezy
@@ -2479,6 +2535,7 @@ piuparts-flags =
 	%(flags-end-wheezy)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = squeeze
@@ -2494,6 +2551,7 @@ piuparts-flags =
 	%(flags-end-wheezy)s
 depends-sections = squeeze2wheezy-rcmd_i386/main squeeze2wheezy-rcmd_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = squeeze
 upgrade-test-distros = squeeze wheezy
@@ -2508,6 +2566,7 @@ piuparts-flags =
 	%(flags-end-wheezy)s
 depends-sections = squeeze2wheezy-rcmd_i386/main squeeze2wheezy-rcmd_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = squeeze
 upgrade-test-distros = squeeze wheezy
@@ -2605,6 +2664,7 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 	%(flags-end-testing)s
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = squeeze
@@ -2619,6 +2679,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 depends-sections = squeeze222testing_i386/main squeeze222testing_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = squeeze
 upgrade-test-distros = squeeze wheezy jessie stretch testing
@@ -2632,6 +2693,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 depends-sections = squeeze222testing_i386/main squeeze222testing_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = squeeze
 upgrade-test-distros = squeeze wheezy jessie stretch testing
@@ -2727,6 +2789,7 @@ piuparts-flags =
 	%(flags-end-jessie)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = wheezy
@@ -2741,6 +2804,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = wheezy2jessie_i386/main wheezy2jessie_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = wheezy
 upgrade-test-distros = wheezy jessie
@@ -2754,6 +2818,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = wheezy2jessie_i386/main wheezy2jessie_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = wheezy
 upgrade-test-distros = wheezy jessie
@@ -2819,6 +2884,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 	-i /usr/lib/dbus-1.0/dbus-daemon-launch-helper
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = wheezy
@@ -2836,6 +2902,7 @@ piuparts-flags =
 	-i /usr/lib/dbus-1.0/dbus-daemon-launch-helper
 depends-sections = wheezy2jessie-rcmd_i386/main wheezy2jessie-rcmd_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = wheezy
 upgrade-test-distros = wheezy jessie
@@ -2852,6 +2919,7 @@ piuparts-flags =
 	-i /usr/lib/dbus-1.0/dbus-daemon-launch-helper
 depends-sections = wheezy2jessie-rcmd_i386/main wheezy2jessie-rcmd_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = wheezy
 upgrade-test-distros = wheezy jessie
@@ -3083,6 +3151,7 @@ piuparts-flags =
 	%(flags-start-wheezy)s
 	%(flags-end-testing)s
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = wheezy
@@ -3097,6 +3166,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 depends-sections = wheezy222testing_i386/main wheezy222testing_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = wheezy
 upgrade-test-distros = wheezy jessie stretch testing
@@ -3110,6 +3180,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 depends-sections = wheezy222testing_i386/main wheezy222testing_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = wheezy
 upgrade-test-distros = wheezy jessie stretch testing
@@ -3251,6 +3322,7 @@ piuparts-flags =
 	%(flags-end-stretch)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = jessie
@@ -3265,6 +3337,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = jessie2stretch_i386/main jessie2stretch_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = jessie
 upgrade-test-distros = jessie stretch
@@ -3278,6 +3351,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = jessie2stretch_i386/main jessie2stretch_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = jessie
 upgrade-test-distros = jessie stretch
@@ -3293,6 +3367,7 @@ piuparts-flags =
 	%(flags-end-stretch)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = jessie
@@ -3310,6 +3385,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = jessie3stretch_i386/main jessie3stretch_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = jessie
 upgrade-test-distros = jessie stretch
@@ -3326,6 +3402,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = jessie3stretch_i386/main jessie3stretch_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = jessie
 upgrade-test-distros = jessie stretch
@@ -3440,6 +3517,7 @@ piuparts-flags =
 	%(flags-end-stretch)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = jessie
@@ -3456,6 +3534,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = jessie2stretch-rcmd_i386/main jessie2stretch-rcmd_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = jessie
 upgrade-test-distros = jessie stretch
@@ -3471,6 +3550,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = jessie2stretch-rcmd_i386/main jessie2stretch-rcmd_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = jessie
 upgrade-test-distros = jessie stretch
@@ -3487,6 +3567,7 @@ piuparts-flags =
 	%(flags-end-stretch)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = jessie
@@ -3505,6 +3586,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = jessie3stretch-rcmd_i386/main jessie3stretch-rcmd_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = jessie
 upgrade-test-distros = jessie stretch
@@ -3522,6 +3604,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = jessie3stretch-rcmd_i386/main jessie3stretch-rcmd_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = jessie
 upgrade-test-distros = jessie stretch
@@ -3659,6 +3742,7 @@ piuparts-flags =
 	%(flags-start-jessie)s
 	%(flags-end-testing)s
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = jessie
@@ -3673,6 +3757,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 depends-sections = jessie222testing_i386/main jessie222testing_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = jessie
 upgrade-test-distros = jessie stretch testing
@@ -3686,6 +3771,7 @@ piuparts-flags =
 	%(flags-end-testing)s
 depends-sections = jessie222testing_i386/main jessie222testing_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = jessie
 upgrade-test-distros = jessie stretch testing
@@ -3827,6 +3913,7 @@ piuparts-flags =
 	%(flags-end-buster)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = stretch
@@ -3841,6 +3928,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = stretch2buster_i386/main stretch2buster_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = stretch
 upgrade-test-distros = stretch buster
@@ -3854,6 +3942,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = stretch2buster_i386/main stretch2buster_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = stretch
 upgrade-test-distros = stretch buster
@@ -3869,6 +3958,7 @@ piuparts-flags =
 	%(flags-end-buster)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = stretch
@@ -3886,6 +3976,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = stretch3buster_i386/main stretch3buster_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = stretch
 upgrade-test-distros = stretch buster
@@ -3902,6 +3993,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = stretch3buster_i386/main stretch3buster_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = stretch
 upgrade-test-distros = stretch buster
@@ -4013,6 +4105,7 @@ piuparts-flags =
 	%(flags-end-buster)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = stretch
@@ -4029,6 +4122,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = stretch2buster-rcmd_i386/main stretch2buster-rcmd_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = stretch
 upgrade-test-distros = stretch buster
@@ -4044,6 +4138,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = stretch2buster-rcmd_i386/main stretch2buster-rcmd_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = stretch
 upgrade-test-distros = stretch buster
@@ -4061,6 +4156,7 @@ piuparts-flags =
 	%(flags-end-buster)s
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 arch = i386
+setarch = linux32
 area = main
 components = main
 distro = stretch
@@ -4080,6 +4176,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = stretch3buster-rcmd_i386/main stretch3buster-rcmd_i386/non-free
 arch = i386
+setarch = linux32
 area = contrib
 distro = stretch
 upgrade-test-distros = stretch buster
@@ -4098,6 +4195,7 @@ piuparts-flags =
 	--scriptsdir /etc/piuparts/scripts-debug-problemresolver
 depends-sections = stretch3buster-rcmd_i386/main stretch3buster-rcmd_i386/contrib
 arch = i386
+setarch = linux32
 area = non-free
 distro = stretch
 upgrade-test-distros = stretch buster


=====================================
master-bin/detect_archive_issues.in
=====================================
@@ -27,7 +27,7 @@ get_config_value URLBASE global urlbase https://piuparts.debian.org
 get_config_value DAYS global reschedule-untestable-days 7
 
 ISSUE_LOG="$MASTER/archive_issues.txt"
-LOG_OUTPUT=`mktemp`
+LOG_OUTPUT=$(mktemp)
 LOG_PREFIX=$(mktemp)
 
 STARTDATE=$(date -u +%s)
@@ -36,8 +36,8 @@ STARTDATE=$(date -u +%s)
 # detect packages which are/were untestable due to archive issue and mark them as such
 #
 
-LOGS=`mktemp`
-URLS=`mktemp`
+LOGS=$(mktemp)
+URLS=$(mktemp)
 for SECTION in $SECTIONS ; do
 	test -d $MASTER/$SECTION || continue
 	URL_SED="s#$MASTER/$SECTION/fail#$URLBASE/$SECTION/untestable#"


=====================================
master-bin/detect_network_issues.in
=====================================
@@ -65,7 +65,7 @@ add_pattern "ERROR: Command failed \(status=-7\):.*'apt-get', 'update'"
 add_pattern 'Package .* .* not found in .*, .* is available'
 add_pattern "AppStream system cache was updated, but problems were found: Metadata files have errors"
 
-FILE=`mktemp`
+FILE=$(mktemp)
 for SECTION in $SECTIONS ; do
 	test -d $MASTER/$SECTION || continue
 	for subdir in fail bugged affected untestable ; do


=====================================
master-bin/detect_piuparts_issues.in
=====================================
@@ -87,7 +87,7 @@ add_pattern "^NameError:"
 add_pattern "^OSError:"
 add_pattern "^SyntaxError:"
 
-FILE=`mktemp`
+FILE=$(mktemp)
 for SECTION in $SECTIONS ; do
 	test -d $MASTER/$SECTION || continue
 	for subdir in fail bugged affected ; do


=====================================
master-bin/report_stale_reserved_packages.in
=====================================
@@ -28,7 +28,7 @@ get_config_value HTDOCS global output-directory
 #
 
 DAYS=1
-LOGS=`mktemp`
+LOGS=$(mktemp)
 for SECTION in $SECTIONS ; do
 	test -d $MASTER/$SECTION/reserved || continue
 	find $MASTER/$SECTION/reserved/ -mtime +$DAYS -name "*.log" 2>/dev/null >> $LOGS


=====================================
master-bin/report_untestable_packages.in
=====================================
@@ -33,7 +33,7 @@ LOG_PREFIX=$(mktemp)
 # find packages which have been in untestable for more than $DAYS days and reschedule them for testing
 #
 
-LOGS=`mktemp`
+LOGS=$(mktemp)
 for SECTION in $SECTIONS ; do
 	# only act on sections with precedence < 100
 	get_config_value PRECEDENCE $SECTION precedence 1


=====================================
piuparts-analyze.py
=====================================
@@ -29,7 +29,7 @@ headers of the log in ./fail to the one in ./bugged and vice versa. It will then
 move the failed log to ./bugged as well.
 
 """
-
+from __future__ import print_function
 
 import os
 import sys
@@ -311,7 +311,7 @@ def mark_logs_with_reported_bugs():
             raise
         except:
             print('ERROR processing %s' % failed_log)
-            print sys.exc_info()[0]
+            print(sys.exc_info()[0])
         alarm(0)
 
 


=====================================
piuparts-report.py
=====================================
@@ -287,7 +287,7 @@ LOG_LIST_BODY_TEMPLATE = """
     <tr class="normalrow">
      <td class="contentcell2" colspan="2">
       $preface
-      The list has $count packages, with $versioncount total versions.
+      The list has $count packages.
      </td>
     </tr>
 $logrows
@@ -891,14 +891,18 @@ class Section:
 
         names = sorted(packages.keys())
         lines = []
-        version_count = 0
         for package in names:
             versions = []
             for pathname, version in packages[package]:
-                version_count += 1
-                versions.append("<a href=\"%s\">%s</a>" %
+                cruft = ""
+                bin_pkg = self._binary_db.get_package(package)
+                if self._source_db.has_package(bin_pkg.source()) and \
+                        bin_pkg.source_version() != self._source_db.get_version(bin_pkg.source()):
+                    cruft = " [cruft]"
+                versions.append("<a href=\"%s\">%s</a>%s" %
                                 (html_protect(pathname),
-                                 html_protect(version)))
+                                 html_protect(version),
+                                 cruft))
             line = "<tr class=\"normalrow\"><td class=\"contentcell2\">%s</td><td class=\"contentcell2\">%s</td></tr>" % \
                                 (html_protect(package),
                                  ", ".join(versions))
@@ -918,7 +922,6 @@ class Section:
                     "title_style": title_style,
                     "preface": preface,
                     "count": len(packages),
-                    "versioncount": version_count,
                     "logrows": "".join(lines),
                 })
 


=====================================
piuparts-slave.py
=====================================
@@ -22,7 +22,7 @@
 
 Lars Wirzenius <liw at iki.fi>
 """
-
+from __future__ import print_function
 
 import os
 import sys
@@ -84,6 +84,7 @@ class Config(piupartslib.conf.Config):
                                          "master-command": None,
                                          "proxy": None,
                                          "mirror": None,
+                                         "setarch": None,
                                          "piuparts-command": "sudo piuparts",
                                          "piuparts-flags": "",
                                          "tmpdir": None,
@@ -115,15 +116,15 @@ def alarm_handler(signum, frame):
 def sigint_handler(signum, frame):
     global interrupted
     interrupted = True
-    print '\nSlave interrupted by the user, waiting for the current test to finish.'
-    print 'Press Ctrl-C again to abort now.'
+    print('\nSlave interrupted by the user, waiting for the current test to finish.')
+    print('Press Ctrl-C again to abort now.')
     signal(SIGINT, old_sigint_handler)
 
 
 def sighup_handler(signum, frame):
     global got_sighup
     got_sighup = True
-    print 'SIGHUP: Will flush finished logs.'
+    print('SIGHUP: Will flush finished logs.')
 
 
 class MasterIsBusy(Exception):
@@ -675,7 +676,11 @@ class Section:
 
         distupgrade = len(self._config.get_distros()) > 1
 
-        command = self._config["piuparts-command"].split()
+        command = []
+        if self._config["setarch"]:
+            command.append("setarch")
+            command.extend(self._config["setarch"].split())
+        command.extend(self._config["piuparts-command"].split())
         if self._config["piuparts-flags"]:
             command.extend(self._config["piuparts-flags"].split())
         if "http_proxy" in os.environ:
@@ -820,7 +825,7 @@ def run_test_with_timeout(cmd, maxwait, kill_all=True):
             stdout, stderr = ps.communicate()
             pids.extend([int(pid) for pid in stdout.split()])
         if p.poll() is None:
-            print 'Sending SIGINT...'
+            print('Sending SIGINT...')
             try:
                 os.killpg(os.getpgid(p.pid), SIGINT)
             except OSError:
@@ -831,7 +836,7 @@ def run_test_with_timeout(cmd, maxwait, kill_all=True):
                 if p.poll() is not None:
                     break
         if p.poll() is None:
-            print 'Sending SIGTERM...'
+            print('Sending SIGTERM...')
             p.terminate()
             # piuparts has 5 seconds to clean up after SIGTERM
             for i in range(10):
@@ -839,13 +844,13 @@ def run_test_with_timeout(cmd, maxwait, kill_all=True):
                 if p.poll() is not None:
                     break
         if p.poll() is None:
-            print 'Sending SIGKILL...'
+            print('Sending SIGKILL...')
             p.kill()
         for pid in pids:
             if pid > 0:
                 try:
                     os.kill(pid, SIGKILL)
-                    print "Killed %d" % pid
+                    print("Killed %d" % pid)
                 except OSError:
                     pass
 
@@ -864,11 +869,11 @@ def run_test_with_timeout(cmd, maxwait, kill_all=True):
         terminate_subprocess(p, kill_all)
         return -1, stdout
     except KeyboardInterrupt:
-        print '\nSlave interrupted by the user, cleaning up...'
+        print('\nSlave interrupted by the user, cleaning up...')
         try:
             terminate_subprocess(p, kill_all)
         except KeyboardInterrupt:
-            print '\nTerminating piuparts was interrupted... manual cleanup still neccessary.'
+            print('\nTerminating piuparts was interrupted... manual cleanup still neccessary.')
             raise
         raise
 
@@ -880,7 +885,11 @@ def run_test_with_timeout(cmd, maxwait, kill_all=True):
 
 
 def create_chroot(config, tarball, distro):
-    command = config["piuparts-command"].split()
+    command = []
+    if config["setarch"]:
+        command.append("setarch")
+        command.extend(config["setarch"].split())
+    command.extend(config["piuparts-command"].split())
     if config["piuparts-flags"]:
         command.extend(config["piuparts-flags"].split())
     if "http_proxy" in os.environ:
@@ -1002,8 +1011,8 @@ if __name__ == "__main__":
     try:
         main()
     except KeyboardInterrupt:
-        print ''
-        print 'Slave interrupted by the user, exiting...'
+        print('')
+        print('Slave interrupted by the user, exiting...')
         sys.exit(1)
 
 # vi:set et ts=4 sw=4 :


=====================================
piuparts.py
=====================================
@@ -30,7 +30,7 @@ more usage information.
 
 Lars Wirzenius <liw at iki.fi>
 """
-
+from __future__ import print_function
 
 VERSION = "__PIUPARTS_VERSION__"
 
@@ -3175,7 +3175,7 @@ def main():
 
     # check if user has root privileges
     if os.getuid():
-        print 'You need to be root to use piuparts.'
+        print('You need to be root to use piuparts.')
         sys.exit(1)
 
     logging.info("-" * 78)
@@ -3230,18 +3230,18 @@ if __name__ == "__main__":
     try:
         main()
     except KeyboardInterrupt:
-        print ''
-        print 'Piuparts interrupted by the user, exiting...'
+        print('')
+        print('Piuparts interrupted by the user, exiting...')
         panic(1)
         sys.exit(1)
     except SystemExit:
         raise
     except:
-        print ''
-        print 'Piuparts caught exception, exiting...'
-        print '-'*60
+        print('')
+        print('Piuparts caught exception, exiting...')
+        print('-'*60)
         traceback.print_exc(file=sys.stdout)
-        print '-'*60
+        print('-'*60)
         panic(1)
         raise
 


=====================================
piupartslib/dwke.py
=====================================
@@ -34,6 +34,8 @@ LOG_EXT = '.log'
 class Problem():
 
     """ Encapsulate a particular known problem """
+    required_tags = ["PATTERN", "WHERE", "ISSUE", "HEADER", "HELPTEXT"]
+    optional_tags = ["EXCLUDE_PATTERN", "EXPLAIN", "PRIORITY"]
 
     def __init__(self, probpath):
         """probpath is the path to the problem definition file"""
@@ -44,10 +46,6 @@ class Problem():
 
         self.tags_are_valid = True
 
-        self.required_tags = ["PATTERN", "WHERE", "ISSUE",
-                              "HEADER", "HELPTEXT"]
-        self.optional_tags = ["EXCLUDE_PATTERN", "EXPLAIN", "PRIORITY"]
-
         self.init_problem()
 
         for tag in self.required_tags:
@@ -194,22 +192,19 @@ def get_file_dict(workdirs, ext):
     """For files in [workdirs] with extension 'ext', create a dict of
        <pkgname>_<version>: <path>"""
 
-    filedict = {}
-
-    for dir in workdirs:
-        for fl in os.listdir(dir):
-            if os.path.splitext(fl)[1] == ext:
-                filedict[os.path.splitext(os.path.basename(fl))[0]] \
-                    = os.path.join(dir, fl)
-
-    return filedict
+    return {os.path.splitext(os.path.basename(fl))[0]: os.path.join(d, fl)
+            for d in workdirs
+            for fl in os.listdir(d)
+            if os.path.splitext(fl)[1] == ext}
 
 
 def create_problem_list(pdir):
 
     plist = []
+    pdir_list = os.listdir(pdir)
+    pdir_list.sort()
 
-    for pfile in [x for x in sorted(os.listdir(pdir)) if x.endswith(".conf")]:
+    for pfile in [x for x in pdir_list if x.endswith(".conf")]:
         prob = Problem(os.path.join(pdir, pfile))
 
         if prob.valid():
@@ -258,13 +253,14 @@ def make_kprs(logdict, kprdict, problem_list):
 
             where = get_where(logpath)
 
-            kprs = ""
-            for problem in problem_list:
-                if problem.has_problem(logbody, where):
-                    kprs += "%s/%s.log %s\n" % (where, pkg_spec, problem.name)
+            kprs = ["%s/%s.log %s\n" % (where, pkg_spec, problem.name)
+                    for problem in problem_list
+                    if problem.has_problem(logbody, where)]
+
+            kprs = ''.join(kprs)
 
-            if not where in ['pass'] and not len(kprs):
-                kprs += "%s/%s.log %s\n" % (where, pkg_spec, "unclassified_failures.conf")
+            if where != 'pass' and not kprs:
+                kprs = "%s/%s.log %s\n" % (where, pkg_spec, "unclassified_failures.conf")
 
             with open(get_kpr_path(logpath), 'w') as f:
                 f.write(kprs)


=====================================
piupartslib/pkgsummary.py
=====================================
@@ -78,7 +78,7 @@
 #
 # The global file also includes an 'overall' json-section, which contains
 # the 'worst' result across the other json-sections.
-
+from __future__ import print_function
 
 import json
 import datetime
@@ -240,4 +240,4 @@ if __name__ == '__main__':
     for pkg in summary['packages']:
         flag, blocked, url = summary['packages'][pkg][DEFSEC]
 
-        print pkg, flag, url, tooltip(summary, pkg)
+        print(pkg, flag, url, tooltip(summary, pkg))


=====================================
slave-bin/slave_stop.in
=====================================
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-# Copyright 2017 Holger Levsen (holger at layer-acht.org)
+# Copyright 2017-2019 Holger Levsen (holger at layer-acht.org)
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -45,6 +45,13 @@ while pgrep --full '/usr/bin/python @sharedir@/piuparts/piuparts-slave' > /dev/n
 	echo -n "$(date -u +%T) - "
 	pgrep --full '/usr/bin/python @sharedir@/piuparts/piuparts-slave' | xargs -r echo -n "slaves running: "
 	SLEEP=$(( $i * $i ))
+	BUSY=$(ps fax | grep -v grep | grep '/usr/bin/python @sbindir@/piuparts' | awk '{print $NF}')
+	if [ -n "$BUSY" ] ; then
+		# really/meaningful busy
+		echo
+		echo "slaves are busy with:"
+		echo "$BUSY"
+	fi
 	echo -n " sleeping ${SLEEP}sec now..."
 	for j in $(seq 1 $SLEEP) ; do
 		sleep 1



View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/3a3d80df20625d4e40f483411066c2165f4d1f2a...fc43352bebcabde014a5e91fe990c028bbf8a9c4

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/3a3d80df20625d4e40f483411066c2165f4d1f2a...fc43352bebcabde014a5e91fe990c028bbf8a9c4
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/20190211/b1c4abd5/attachment-0001.html>


More information about the Piuparts-devel mailing list