Skip to content

Commits on Source 18

Show whitespace changes
Inline Side-by-side
bug-templates/logrotate_exits_with_error_after_package_removal.mail 0 → 100644
View file @ 79cf2d87
To: submit@bugs.debian.org
Subject: logrotate exits with error after package removal
Package:
Version:
Severity: important
User: debian-qa@lists.debian.org
Usertags: piuparts
Hi,
during a test with piuparts I noticed your package's logrotate
configuration causes logrotate to exit with an error after
the package has been removed.
From the attached log (scroll to the bottom...):
cheers,
custom-scripts/scripts-lenny/post_remove_exceptions_lenny
View file @ 79cf2d87
......@@ -11,6 +11,11 @@ case "$PIUPARTS_DISTRIBUTION" in
esac
case ${PIUPARTS_OBJECTS%%=*} in
apt-xapian-index)
# wait for update-apt-xapian-index in the background to finish
log_debug
sleep 30
;;
postgis)
#560409: postgis can't be purged if postgresql is no longer installed
# (fails due to a missing directory)
......
custom-scripts/scripts-lenny/post_setup_lenny-fake-essential
View file @ 79cf2d87
......@@ -17,6 +17,9 @@ case ${PIUPARTS_OBJECTS%%=*} in
# allow testing of the fake essential packages
exit 0
;;
console-log|systraq)
USED_DURING_PURGE="$USED_DURING_PURGE perl-modules"
;;
docbookwiki)
USED_DURING_PURGE="$USED_DURING_PURGE mysql-client"
;;
......
custom-scripts/scripts/post_distupgrade_base_cleanup
View file @ 79cf2d87
......@@ -76,6 +76,14 @@ if [ "$PIUPARTS_DISTRIBUTION" = "stretch" ] || \
fi
if [ "$PIUPARTS_DISTRIBUTION" = "buster" ] || \
[ "$PIUPARTS_DISTRIBUTION" = "buster-proposed" ] ; then
mark_for_purge libcryptsetup4
mark_for_purge libprocps6
fi
if [ -n "$PURGE" ]; then
echo "Removing packages from base system:$PURGE"
apt-get -y remove --purge $PURGE
......
custom-scripts/scripts/post_setup_forbid_home
View file @ 79cf2d87
......@@ -17,7 +17,11 @@ esac
if [ -d /home ]; then
echo "Disabling /home"
mv /home /home.distrib
if dpkg-divert --help | grep -q -e --no-rename ; then
dpkg-divert --no-rename /home
else
dpkg-divert /home
fi
echo "This is a dummy file to prevent creating directories in /home" > /home
chmod 000 /home
fi
custom-scripts/scripts/pre_distupgrade_zz_database-server
View file @ 79cf2d87
......@@ -136,10 +136,10 @@ case "${PIUPARTS_DISTRIBUTION}:${PIUPARTS_DISTRIBUTION_NEXT}" in
upgrade_pg_cluster 9.4 9.6
;;
stretch:buster)
upgrade_pg_cluster 9.6 10
upgrade_pg_cluster 9.6 11
;;
stretch:sid)
upgrade_pg_cluster 9.6 10
upgrade_pg_cluster 9.6 11
;;
esac
......
custom-scripts/scripts/pre_install_exceptions
View file @ 79cf2d87
......@@ -83,6 +83,12 @@ case ${PIUPARTS_OBJECTS%%=*} in
echo "bugzilla3 bugzilla3/bugzilla_admin_real_name string Bz" | debconf-set-selections
echo "bugzilla3 bugzilla3/bugzilla_admin_pwd password bzbzbzbz" | debconf-set-selections
;;
msttcorefonts|\
ttf-mscorefonts-installer)
# Recommends: ca-certificates
log_debug
apt-get -y install ca-certificates
;;
samhain)
# work around #749602
log_debug
......@@ -221,10 +227,6 @@ if [ "$PIUPARTS_DISTRIBUTION" = "lenny" ]; then
log_debug
apt-get -y install defoma
;;
ttf-mscorefonts-installer|msttcorefonts)
log_debug
apt-get -y install ca-certificates
;;
esac
# prefer inn over cnews (bad version number cr.g7-40.4)
......
custom-scripts/scripts/pre_remove_exceptions
View file @ 79cf2d87
......@@ -32,6 +32,14 @@ case ${PIUPARTS_OBJECTS%%=*} in
rm -fv /etc/isdn/*
fi
;;
original-awk)
case "$PIUPARTS_DISTRIBUTION" in
lenny)
log_debug
# apt considers this as essential
echo 'Yes, do as I say!' | apt-get -y --force-yes remove original-awk
esac
;;
esac
case "$PIUPARTS_DISTRIBUTION" in
......
debian/changelog
View file @ 79cf2d87
piuparts (0.93) UNRELEASED; urgency=medium
[ Andreas Beckmann ]
* piuparts.py:
- Report the package that owns a broken symlink.
- --allow-database now also enables firebird3.0.
* piuparts.conf: Disable rescheduling tests that end in wheezy.
* piuparts.conf.anbe: Add some more example sections.
* piupartslib/packagesdb.py:
- Add methods Package.source(), Package.source_version().
......@@ -16,7 +20,12 @@ piuparts (0.93) UNRELEASED; urgency=medium
keys (lenny, squeeze). Drop the --no-check-valid-until from *.conf since
that is active for all steps in a distupgrade test while the new scripts
only enable it for the distros that actually need it.
* scripts/post_setup_forbid_home: Use dpkg-divert --no-rename (dpkg 1.19.1).
* scripts/pre_distupgrade_zz_database-server: sid/buster has postgresql 11.
* scripts/post_distupgrade_base_cleanup: Remove libcryptsetup4, libprocps6
from the buster reference chroot.
* Overhaul some exceptions.
* Add bug template for logrotate errors after package removal.
[ Holger Levsen ]
* piuparts-report.py:
......
instances/piuparts.conf-template.pejacevic
View file @ 79cf2d87
......@@ -39,24 +39,26 @@ flags-end-buster =
# common flags for tests starting in stretch
flags-start-stretch =
# see #604807:
--skip-logrotatefiles-test
# no flags needed
# common flags for tests ending in stretch
flags-end-stretch =
# see #604807:
--skip-logrotatefiles-test
# debsums failures won't be fixed in stretch, mostly related to
# oldstyle packaging of aspell dictionaries
--warn-on-debsums-errors
# common flags for tests starting in jessie
flags-start-jessie =
# see #604807:
--skip-logrotatefiles-test
# no flags needed
# common flags for tests ending in jessie
flags-end-jessie =
# extra fake-essential packages for successfully purging in jessie
--scriptsdir /etc/piuparts/scripts-jessie
# see #604807:
--skip-logrotatefiles-test
# debsums failures won't be fixed in jessie, mostly related to
# obsolete/renamed conffiles that moved to different packages
--warn-on-debsums-errors
......@@ -65,13 +67,14 @@ flags-end-jessie =
# common flags for tests starting in wheezy
flags-start-wheezy =
# see #604807:
--skip-logrotatefiles-test
# no flags needed
# common flags for tests ending in wheezy
flags-end-wheezy =
# extra fake-essential packages for successfully purging in wheezy
--scriptsdir /etc/piuparts/scripts-wheezy
# see #604807:
--skip-logrotatefiles-test
# debsums failures won't be fixed in wheezy
--warn-on-debsums-errors
# won't be fixed in wheezy
......@@ -82,8 +85,6 @@ flags-start-squeeze =
# up to squeeze a non-empty /etc/shells was shipped, actually installing
# and removing a shell would remove its entry from /etc/shells
-i /etc/shells
# see #604807:
--skip-logrotatefiles-test
# common flags for tests ending in squeeze
flags-end-squeeze =
......@@ -102,8 +103,6 @@ flags-start-lenny =
# up to squeeze a non-empty /etc/shells was shipped, actually installing
# and removing a shell would remove its entry from /etc/shells
-i /etc/shells
# see #604807:
--skip-logrotatefiles-test
[global]
......@@ -248,8 +247,7 @@ piuparts-flags =
%(flags-start-wheezy)s
distro = None
upgrade-test-distros = wheezy
# 1 month (60*60*24*30)
max-tgz-age = 2592000
max-tgz-age = 0
[tarball/squeeze]
......@@ -695,20 +693,22 @@ piuparts-flags =
%(flags-start-wheezy)s
%(flags-end-wheezy)s
distro = wheezy
reschedule-old-count = 0
[wheezy-lts]
precedence = 10
precedence = 100
json-sections = none
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
%(flags-end-wheezy)s
distro = wheezy-lts
reschedule-old-count = 0
[wheezy-security]
precedence = 10
precedence = 100
json-sections = none
piuparts-flags =
%(flags-default)s
......@@ -716,6 +716,7 @@ piuparts-flags =
%(flags-end-wheezy)s
depends-sections = wheezy
distro = wheezy/updates
reschedule-old-count = 0
[wheezy-pu]
......@@ -727,10 +728,11 @@ piuparts-flags =
%(flags-end-wheezy)s
depends-sections = wheezy
distro = wheezy-proposed-updates
reschedule-old-count = 0
[wheezy2lts]
precedence = 10
precedence = 100
json-sections = none
piuparts-flags =
%(flags-default)s
......@@ -738,10 +740,11 @@ piuparts-flags =
%(flags-end-wheezy)s
distro = wheezy
upgrade-test-distros = wheezy wheezy-lts
reschedule-old-count = 0
[squeeze2wheezy-lts]
precedence = 10
precedence = 100
json-sections = none
piuparts-flags =
%(flags-default)s
......@@ -749,6 +752,7 @@ piuparts-flags =
%(flags-end-wheezy)s
distro = squeeze
upgrade-test-distros = squeeze wheezy-lts
reschedule-old-count = 0
[squeeze2wheezy]
......@@ -760,10 +764,11 @@ piuparts-flags =
%(flags-end-wheezy)s
distro = squeeze
upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2bpo2wheezy]
precedence = 10
precedence = 100
json-sections = none
piuparts-flags =
%(flags-default)s
......@@ -772,6 +777,7 @@ piuparts-flags =
depends-sections = squeeze
distro = squeeze-backports
upgrade-test-distros = squeeze squeeze-backports wheezy-lts
reschedule-old-count = 0
[squeeze2bpo-sloppy]
......
instances/piuparts.conf.anbe
View file @ 79cf2d87
......@@ -4,7 +4,6 @@
[DEFAULT]
flags-base =
--skip-logrotatefiles-test
--warn-on-others
--no-eatmydata
--scriptsdir /etc/piuparts/scripts
......@@ -30,16 +29,19 @@ flags-end-buster =
flags-start-stretch =
flags-end-stretch =
--skip-logrotatefiles-test
--warn-on-debsums-errors
flags-start-jessie =
flags-end-jessie =
--skip-logrotatefiles-test
--warn-on-debsums-errors
--warn-on-install-over-symlink
--scriptsdir /etc/piuparts/scripts-jessie
flags-start-wheezy =
flags-end-wheezy =
--skip-logrotatefiles-test
--warn-on-debsums-errors
--warn-on-install-over-symlink
--scriptsdir /etc/piuparts/scripts-wheezy
......@@ -47,6 +49,7 @@ flags-end-wheezy =
flags-start-squeeze =
-i /etc/shells
flags-end-squeeze =
--skip-logrotatefiles-test
--warn-on-debsums-errors
--warn-on-install-over-symlink
--scriptsdir /etc/piuparts/scripts-squeeze
......@@ -56,6 +59,7 @@ flags-start-lenny =
-i /etc/shells
flags-end-lenny =
--skip-cronfiles-test
--skip-logrotatefiles-test
--warn-on-debsums-errors
--warn-on-install-over-symlink
--scriptsdir /etc/piuparts/scripts-lenny
......@@ -136,11 +140,6 @@ sections =
jessie-updates/main
jessie-pu/main
jessie-backports/main
wheezy/main
wheezy-rcmd/main
wheezy-lts/main
wheezy-security/main
wheezy-backports/main
sid2experimental/main
testing2sid/main
stable2sid/main
......@@ -167,15 +166,6 @@ sections =
jessie3stretch-rcmd_i386/main
jessie2stretch-iri/main
jessie2bpo2stretch/main
wheezy2lts/main
wheezy2jessie/main
wheezy2jessie_i386/main
wheezy2jessie-rcmd/main
wheezy2jessie-rcmd_i386/main
wheezy2jessie-sysv/main
wheezy2jessie-apt1st/main
wheezy2jessie-iri/main
wheezy2bpo2jessie/main
jessie222testing/main
jessie222testing_i386/main
wheezy222testing/main
......@@ -216,11 +206,6 @@ sections =
jessie-updates/contrib
jessie-pu/contrib
jessie-backports/contrib
wheezy/contrib
wheezy-rcmd/contrib
wheezy-lts/contrib
# wheezy-security/contrib
wheezy-backports/contrib
sid2experimental/contrib
testing2sid/contrib
stable2sid/contrib
......@@ -247,15 +232,6 @@ sections =
jessie3stretch-rcmd_i386/contrib
jessie2stretch-iri/contrib
jessie2bpo2stretch/contrib
wheezy2lts/contrib
wheezy2jessie/contrib
wheezy2jessie_i386/contrib
wheezy2jessie-rcmd/contrib
wheezy2jessie-rcmd_i386/contrib
wheezy2jessie-sysv/contrib
wheezy2jessie-apt1st/contrib
wheezy2jessie-iri/contrib
wheezy2bpo2jessie/contrib
jessie222testing/contrib
jessie222testing_i386/contrib
wheezy222testing/contrib
......@@ -296,11 +272,6 @@ sections =
jessie-updates/non-free
jessie-pu/non-free
jessie-backports/non-free
wheezy/non-free
wheezy-rcmd/non-free
wheezy-lts/non-free
# wheezy-security/non-free
wheezy-backports/non-free
sid2experimental/non-free
testing2sid/non-free
stable2sid/non-free
......@@ -327,15 +298,6 @@ sections =
jessie3stretch-rcmd_i386/non-free
jessie2stretch-iri/non-free
jessie2bpo2stretch/non-free
wheezy2lts/non-free
wheezy2jessie/non-free
wheezy2jessie_i386/non-free
wheezy2jessie-rcmd/non-free
wheezy2jessie-rcmd_i386/non-free
wheezy2jessie-sysv/non-free
wheezy2jessie-apt1st/non-free
wheezy2jessie-iri/non-free
wheezy2bpo2jessie/non-free
jessie222testing/non-free
jessie222testing_i386/non-free
wheezy222testing/non-free
......@@ -345,6 +307,20 @@ sections =
lenny222testing/non-free
lenny222testing_i386/non-free
#
wheezy/main
wheezy-rcmd/main
wheezy-lts/main
wheezy-security/main
wheezy-backports/main
wheezy2lts/main
wheezy2jessie/main
wheezy2jessie_i386/main
# wheezy2jessie-rcmd/main
# wheezy2jessie-rcmd_i386/main
# wheezy2jessie-sysv/main
# wheezy2jessie-apt1st/main
wheezy2jessie-iri/main
wheezy2bpo2jessie/main
squeeze/main
squeeze_i386/main
squeeze-lts/main
......@@ -353,14 +329,28 @@ sections =
squeeze2lts2wheezy/main
squeeze2wheezy/main
squeeze2wheezy_i386/main
squeeze2wheezy-rcmd/main
squeeze2wheezy-rcmd_i386/main
# squeeze2wheezy-rcmd/main
# squeeze2wheezy-rcmd_i386/main
squeeze2wheezy-lts/main
squeeze2bpo2wheezy/main
lenny/main
lenny_i386/main
lenny2squeeze/main
#
wheezy/contrib
wheezy-rcmd/contrib
wheezy-lts/contrib
# wheezy-security/contrib
wheezy-backports/contrib
wheezy2lts/contrib
wheezy2jessie/contrib
wheezy2jessie_i386/contrib
# wheezy2jessie-rcmd/contrib
# wheezy2jessie-rcmd_i386/contrib
# wheezy2jessie-sysv/contrib
# wheezy2jessie-apt1st/contrib
wheezy2jessie-iri/contrib
wheezy2bpo2jessie/contrib
squeeze/contrib
squeeze_i386/contrib
squeeze-lts/contrib
......@@ -369,14 +359,28 @@ sections =
squeeze2lts2wheezy/contrib
squeeze2wheezy/contrib
squeeze2wheezy_i386/contrib
squeeze2wheezy-rcmd/contrib
squeeze2wheezy-rcmd_i386/contrib
# squeeze2wheezy-rcmd/contrib
# squeeze2wheezy-rcmd_i386/contrib
squeeze2wheezy-lts/contrib
squeeze2bpo2wheezy/contrib
lenny/contrib
lenny_i386/contrib
lenny2squeeze/contrib
#
wheezy/non-free
wheezy-rcmd/non-free
wheezy-lts/non-free
# wheezy-security/non-free
wheezy-backports/non-free
wheezy2lts/non-free
wheezy2jessie/non-free
wheezy2jessie_i386/non-free
# wheezy2jessie-rcmd/non-free
# wheezy2jessie-rcmd_i386/non-free
# wheezy2jessie-sysv/non-free
# wheezy2jessie-apt1st/non-free
wheezy2jessie-iri/non-free
wheezy2bpo2jessie/non-free
squeeze/non-free
squeeze_i386/non-free
squeeze-lts/non-free
......@@ -385,8 +389,8 @@ sections =
squeeze2lts2wheezy/non-free
squeeze2wheezy/non-free
squeeze2wheezy_i386/non-free
squeeze2wheezy-rcmd/non-free
squeeze2wheezy-rcmd_i386/non-free
# squeeze2wheezy-rcmd/non-free
# squeeze2wheezy-rcmd_i386/non-free
squeeze2wheezy-lts/non-free
squeeze2bpo2wheezy/non-free
lenny/non-free
......@@ -547,8 +551,7 @@ upgrade-test-distros = wheezy
arch = amd64
area = main
components = main
# 60*60*24*30
max-tgz-age = 2592000
max-tgz-age = 0
[tarball/wheezy/i386]
......@@ -560,8 +563,7 @@ upgrade-test-distros = wheezy
arch = i386
area = main
components = main
# 60*60*24*30
max-tgz-age = 2592000
max-tgz-age = 0
[tarball/squeeze/amd64]
......@@ -1690,7 +1692,7 @@ area = non-free
[wheezy/main]
precedence = 10
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1699,10 +1701,10 @@ distro = wheezy
arch = amd64
area = main
components = main
reschedule-old-count = 100
reschedule-old-count = 0
[wheezy/contrib]
precedence = 45
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1711,9 +1713,10 @@ depends-sections = wheezy/main wheezy/non-free
distro = wheezy
arch = amd64
area = contrib
reschedule-old-count = 0
[wheezy/non-free]
precedence = 45
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1722,10 +1725,11 @@ depends-sections = wheezy/main wheezy/contrib
distro = wheezy
arch = amd64
area = non-free
reschedule-old-count = 0
[wheezy-rcmd/main]
precedence = 40
precedence = 1000
description = + With recommended packages.
piuparts-flags =
--install-recommends
......@@ -1736,10 +1740,10 @@ distro = wheezy
arch = i386
area = main
components = main
reschedule-old-count = 100
reschedule-old-count = 0
[wheezy-rcmd/contrib]
precedence = 45
precedence = 1000
description = + With recommended packages.
piuparts-flags =
--install-recommends
......@@ -1750,9 +1754,10 @@ depends-sections = wheezy-rcmd/main wheezy-rcmd/non-free
distro = wheezy
arch = i386
area = contrib
reschedule-old-count = 0
[wheezy-rcmd/non-free]
precedence = 45
precedence = 1000
description = + With recommended packages.
piuparts-flags =
--install-recommends
......@@ -1763,10 +1768,11 @@ depends-sections = wheezy-rcmd/main wheezy-rcmd/contrib
distro = wheezy
arch = i386
area = non-free
reschedule-old-count = 0
[wheezy-security/main]
precedence = 20
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1776,9 +1782,10 @@ distro = wheezy/updates
arch = amd64
area = main
components = main
reschedule-old-count = 0
[wheezy-security/contrib]
precedence = 45
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1789,7 +1796,7 @@ arch = amd64
area = contrib
[wheezy-security/non-free]
precedence = 45
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1798,10 +1805,11 @@ depends-sections = wheezy/main
distro = wheezy/updates
arch = amd64
area = non-free
reschedule-old-count = 0
[wheezy-lts/main]
precedence = 20
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1810,11 +1818,10 @@ distro = wheezy-lts
arch = amd64
area = main
components = main
reschedule-old-count = 333
reschedule-old-days = 25
reschedule-old-count = 0
[wheezy-lts/contrib]
precedence = 45
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1823,10 +1830,10 @@ depends-sections = wheezy-lts/main wheezy-lts/non-free
distro = wheezy-lts
arch = amd64
area = contrib
reschedule-old-days = 25
reschedule-old-count = 0
[wheezy-lts/non-free]
precedence = 45
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1835,11 +1842,11 @@ depends-sections = wheezy-lts/main wheezy-lts/contrib
distro = wheezy-lts
arch = amd64
area = non-free
reschedule-old-days = 25
reschedule-old-count = 0
[wheezy-backports/main]
precedence = 40
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1849,9 +1856,10 @@ distro = wheezy-backports
arch = amd64
area = main
components = main
reschedule-old-count = 0
[wheezy-backports/contrib]
precedence = 45
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1860,9 +1868,10 @@ depends-sections = wheezy/main wheezy/non-free wheezy-backports/main wheezy-back
distro = wheezy-backports
arch = amd64
area = contrib
reschedule-old-count = 0
[wheezy-backports/non-free]
precedence = 45
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -1871,6 +1880,7 @@ depends-sections = wheezy/main wheezy-backports/main wheezy-backports/contrib
distro = wheezy-backports
arch = amd64
area = non-free
reschedule-old-count = 0
[squeeze/main]
......@@ -2315,7 +2325,7 @@ reschedule-old-count = 100
[squeeze2lts2wheezy/main]
precedence = 60
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2330,7 +2340,7 @@ upgrade-test-distros = squeeze squeeze-lts wheezy
reschedule-old-count = 0
[squeeze2lts2wheezy/contrib]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2344,7 +2354,7 @@ upgrade-test-distros = squeeze squeeze-lts wheezy
reschedule-old-count = 0
[squeeze2lts2wheezy/non-free]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2359,7 +2369,7 @@ reschedule-old-count = 0
[squeeze2wheezy/main]
precedence = 60
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2370,10 +2380,10 @@ area = main
components = main
distro = squeeze
upgrade-test-distros = squeeze wheezy
reschedule-old-count = 100
reschedule-old-count = 0
[squeeze2wheezy/contrib]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2383,9 +2393,10 @@ arch = amd64
area = contrib
distro = squeeze
upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2wheezy/non-free]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2395,10 +2406,11 @@ arch = amd64
area = non-free
distro = squeeze
upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2wheezy-lts/main]
precedence = 60
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2409,10 +2421,10 @@ area = main
components = main
distro = squeeze
upgrade-test-distros = squeeze wheezy-lts
reschedule-old-count = 100
reschedule-old-count = 0
[squeeze2wheezy-lts/contrib]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2422,9 +2434,10 @@ arch = amd64
area = contrib
distro = squeeze
upgrade-test-distros = squeeze wheezy-lts
reschedule-old-count = 0
[squeeze2wheezy-lts/non-free]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2434,10 +2447,11 @@ arch = amd64
area = non-free
distro = squeeze
upgrade-test-distros = squeeze wheezy-lts
reschedule-old-count = 0
[squeeze2wheezy_i386/main]
precedence = 60
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2451,7 +2465,7 @@ upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2wheezy_i386/contrib]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2464,7 +2478,7 @@ upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2wheezy_i386/non-free]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2478,7 +2492,7 @@ reschedule-old-count = 0
[squeeze2wheezy-rcmd/main]
precedence = 70
precedence = 1000
description = + Testing with --install-recommends.
piuparts-flags =
--install-recommends
......@@ -2494,7 +2508,7 @@ upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2wheezy-rcmd/contrib]
precedence = 95
precedence = 1000
description = + Testing with --install-recommends.
piuparts-flags =
--install-recommends
......@@ -2509,7 +2523,7 @@ upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2wheezy-rcmd/non-free]
precedence = 95
precedence = 1000
description = + Testing with --install-recommends.
piuparts-flags =
--install-recommends
......@@ -2525,7 +2539,7 @@ reschedule-old-count = 0
[squeeze2wheezy-rcmd_i386/main]
precedence = 70
precedence = 1000
piuparts-flags =
--install-recommends
%(flags-default)s
......@@ -2540,7 +2554,7 @@ upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2wheezy-rcmd_i386/contrib]
precedence = 95
precedence = 1000
piuparts-flags =
--install-recommends
%(flags-default)s
......@@ -2554,7 +2568,7 @@ upgrade-test-distros = squeeze wheezy
reschedule-old-count = 0
[squeeze2wheezy-rcmd_i386/non-free]
precedence = 95
precedence = 1000
piuparts-flags =
--install-recommends
%(flags-default)s
......@@ -2569,7 +2583,7 @@ reschedule-old-count = 0
[squeeze2bpo2wheezy/main]
precedence = 80
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2581,9 +2595,10 @@ arch = amd64
area = main
components = main
upgrade-test-distros = squeeze squeeze-backports wheezy-lts
reschedule-old-count = 0
[squeeze2bpo2wheezy/contrib]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2594,9 +2609,10 @@ distro = squeeze-backports
arch = amd64
area = contrib
upgrade-test-distros = squeeze squeeze-backports wheezy-lts
reschedule-old-count = 0
[squeeze2bpo2wheezy/non-free]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-squeeze)s
......@@ -2607,6 +2623,7 @@ distro = squeeze-backports
arch = amd64
area = non-free
upgrade-test-distros = squeeze squeeze-backports wheezy-lts
reschedule-old-count = 0
[squeeze222testing/main]
......@@ -2690,7 +2707,7 @@ reschedule-old-count = 100
[wheezy2lts/main]
precedence = 60
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -2701,9 +2718,10 @@ area = main
components = main
distro = wheezy
upgrade-test-distros = wheezy wheezy-lts
reschedule-old-count = 0
[wheezy2lts/contrib]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -2713,9 +2731,10 @@ arch = amd64
area = contrib
distro = wheezy
upgrade-test-distros = wheezy wheezy-lts
reschedule-old-count = 0
[wheezy2lts/non-free]
precedence = 95
precedence = 1000
piuparts-flags =
%(flags-default)s
%(flags-start-wheezy)s
......@@ -2725,6 +2744,7 @@ arch = amd64
area = non-free
distro = wheezy
upgrade-test-distros = wheezy wheezy-lts
reschedule-old-count = 0
[wheezy2jessie/main]
......
master-bin/archive_old_logs.in
View file @ 79cf2d87
......@@ -51,8 +51,7 @@ for SECTION in $SECTIONS ; do
done
fi
done
NUM_CPU=$(grep -c ^processor /proc/cpuinfo)
find archive/ -name '*.log' | xargs -P $NUM_CPU -n 1 -r xz -f
find archive/ -name '*.log' | nice xargs -P $(nproc) -n 1 -r xz -f
if [ -n "$OUTPUT" ] ; then
echo
echo
......
master-bin/detect_network_issues.in
View file @ 79cf2d87
......@@ -58,7 +58,6 @@ add_pattern "E: Version '.*' for '.*' was not found"
add_pattern 'E: Method file has died unexpectedly!'
add_pattern "E: Sub-process rred received a segmentation fault."
add_pattern "ERROR: Command failed \(status=-7\):.*'apt-get', 'update'"
add_pattern 'WARNING: The following packages cannot be authenticated!'
add_pattern 'Package .* .* not found in .*, .* is available'
add_pattern "AppStream system cache was updated, but problems were found: Metadata files have errors"
......
piuparts.py
View file @ 79cf2d87
......@@ -3,7 +3,7 @@
#
# Copyright 2005 Lars Wirzenius (liw@iki.fi)
# Copyright © 2007-2018 Holger Levsen (holger@layer-acht.org)
# Copyright © 2010-2017 Andreas Beckmann (anbe@debian.org)
# Copyright © 2010-2018 Andreas Beckmann (anbe@debian.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
......@@ -1071,6 +1071,7 @@ class Chroot:
policy += 'test "$1" = "postgresql" && exit 0\n'
policy += 'test "$1" = "postgresql-8.3" && exit 0\n'
policy += 'test "$1" = "firebird2.5-super" && exit 0\n'
policy += 'test "$1" = "firebird3.0" && exit 0\n'
policy += "exit 101\n"
create_file(full_name, policy)
os.chmod(full_name, 0o755)
......@@ -1790,7 +1791,7 @@ class Chroot:
return True
return False
def check_for_broken_symlinks(self, warn_only=None):
def check_for_broken_symlinks(self, warn_only=None, file_owners={}):
"""Check that all symlinks in chroot are non-broken."""
if not settings.check_broken_symlinks:
return
......@@ -1809,7 +1810,10 @@ class Chroot:
target = os.readlink(full_name)
except os.error:
target = "<unknown>"
broken.append("%s -> %s" % (name, target))
entry = "%s -> %s" % (name, target)
if name in file_owners:
entry += " (%s)" % ", ".join(file_owners[name])
broken.append(entry)
if broken:
if settings.warn_broken_symlinks or warn_only:
logging.error("WARN: Broken symlinks:\n%s" %
......@@ -2369,7 +2373,7 @@ def install_purge_test(chroot, chroot_state, package_files, packages, extra_pack
logging.info("Validating chroot after purge")
chroot.check_debsums()
chroot.check_for_no_processes()
chroot.check_for_broken_symlinks()
chroot.check_for_broken_symlinks(file_owners=file_owners)
if not check_results(chroot, chroot_state_with_deps, file_owners, deps_info=deps_info):
return False
logging.info("Reinstalling after purge")
......@@ -2381,12 +2385,12 @@ def install_purge_test(chroot, chroot_state, package_files, packages, extra_pack
chroot.install_packages(package_files, packages, with_scripts=True)
chroot.install_packages(package_files, packages, with_scripts=True, reinstall=True)
chroot.check_for_no_processes()
chroot.check_for_broken_symlinks()
chroot.disable_testdebs_repo()
file_owners = chroot.get_files_owned_by_packages()
chroot.disable_testdebs_repo()
chroot.check_for_no_processes()
chroot.check_for_broken_symlinks(file_owners=file_owners)
# Remove all packages from the chroot that weren't there initially.
chroot.restore_selections(chroot_state, packages)
......@@ -2394,7 +2398,7 @@ def install_purge_test(chroot, chroot_state, package_files, packages, extra_pack
chroot.run_scripts("post_test")
chroot.check_for_no_processes(fail=True)
chroot.check_for_broken_symlinks()
chroot.check_for_broken_symlinks(file_owners=file_owners)
return check_results(chroot, chroot_state, file_owners, deps_info=deps_info)
......@@ -2424,12 +2428,12 @@ def install_upgrade_test(chroot, chroot_state, package_files, packages, old_pack
chroot.install_packages(package_files, packages)
chroot.check_for_no_processes()
chroot.check_for_broken_symlinks()
chroot.disable_testdebs_repo()
file_owners = chroot.get_files_owned_by_packages()
chroot.disable_testdebs_repo()
chroot.check_for_no_processes()
chroot.check_for_broken_symlinks(file_owners=file_owners)
# Remove all packages from the chroot that weren't there initially.
chroot.restore_selections(chroot_state, packages)
......@@ -2437,7 +2441,7 @@ def install_upgrade_test(chroot, chroot_state, package_files, packages, old_pack
chroot.run_scripts("post_test")
chroot.check_for_no_processes(fail=True)
chroot.check_for_broken_symlinks()
chroot.check_for_broken_symlinks(file_owners=file_owners)
return check_results(chroot, chroot_state, file_owners)
......@@ -2588,10 +2592,10 @@ def install_and_upgrade_between_distros(package_files, packages_qualified):
chroot.disable_testdebs_repo()
chroot.check_for_no_processes()
file_owners = chroot.get_files_owned_by_packages()
chroot.check_for_no_processes()
# Remove all packages from the chroot that weren't in the reference chroot.
chroot.restore_selections(chroot_state, packages_qualified)
......