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

@@ -29,6 +29,15 @@ piuparts (0.97) UNRELEASED; urgency=medium
     - swap stable2sid and stable22sid priorities, to promote the one reported
       to DDPO.
 
+  [ Andreas Beckmann ]
+  * piuparts-slave.py:
+    - Support prepending a setarch command to the piuparts invokation.
+  * piuparts-report.py:
+    - Report [cruft] in logfile lists.
+  * 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.
+
  -- Holger Levsen <holger@debian.org>  Sun, 13 Jan 2019 16:58:44 +0100
 
 piuparts (0.96) unstable; urgency=medium

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

@@ -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,
@@ -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:
@@ -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: