[Piuparts-devel] [Git][debian/piuparts][develop] 7 commits: unify uninstallability messages
Holger Levsen
gitlab at salsa.debian.org
Thu May 30 22:44:49 BST 2019
Holger Levsen pushed to branch develop at Debian / piuparts
Commits:
276d753d by Andreas Beckmann at 2019-05-30T21:43:43Z
unify uninstallability messages
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
2b557a1a by Andreas Beckmann at 2019-05-30T21:43:44Z
naist-jdic/lenny is no longer installable due to archive corruption
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
1f022fcc by Andreas Beckmann at 2019-05-30T21:43:44Z
handle libdbd-oracle-perl-dbgsym separately
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
3d3160fd by Andreas Beckmann at 2019-05-30T21:43:44Z
work around spurious systemd-sysv/jessie reinstall failure
this command fails in jessie due to a spurious dependency cycle (#237470):
# apt-get --reinstall install systemd-sysv systemd
Reading package lists... Done
Building dependency tree
Reading state information... Done
0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
Need to get 0 B/2593 kB of archives.
After this operation, 0 B of additional disk space will be used.
E: Couldn't configure systemd-sysv:amd64, probably a dependency cycle.
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
5316cc00 by Andreas Beckmann at 2019-05-30T21:43:44Z
fix libudev1 installation in jessie-backports
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
60c68d13 by Andreas Beckmann at 2019-05-30T21:43:44Z
reschedule_piuparts_tests: factor out recycle_logfiles()
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
932a275e by Andreas Beckmann at 2019-05-30T21:43:44Z
reschedule_piuparts_tests: add --logfiles mode
all arguments are logfiles that are to be recycled
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
5 changed files:
- custom-scripts/scripts/is_testable_uninstallable
- custom-scripts/scripts/pre_install_exceptions
- custom-scripts/scripts/pre_remove_exceptions
- master-bin/reschedule_piuparts_tests.in
- piupartslib/packagesdb.py
Changes:
=====================================
custom-scripts/scripts/is_testable_uninstallable
=====================================
@@ -50,13 +50,13 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "lenny" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
blootbot)
- skip_distupgrade "#502753: fails to install: prompts without using debconf"
+ skip_distupgrade "#502753: blootbot: fails to install: prompts without using debconf"
;;
distributed-net)
- skip_distupgrade "#655922: noninteractive install: postinst loops infinitely"
+ skip_distupgrade "#655922: distributed-net: noninteractive install: postinst loops infinitely"
;;
dnscache-run)
- skip_distupgrade "#664848: breaks dns resolution in chroot"
+ skip_distupgrade "#664848: dnscache-run: breaks dns resolution in chroot"
;;
libdbd-oracle-perl|\
ora2pg)
@@ -66,30 +66,35 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "lenny" ]; then
libpils-dev|\
libstonith0|\
libstonith-dev)
- skip_distupgrade "#702055: transitional packages uninstallable in lenny"
+ skip_distupgrade "#702055: ${PIUPARTS_OBJECTS%%=*}: transitional package uninstallable in lenny"
;;
mhc)
- skip_distupgrade "#696231: fails to install: emacs-package-install failure"
+ skip_distupgrade "#696231: mhc: fails to install: emacs-package-install failure"
;;
multex-bin)
- skip_distupgrade "#668791: fails to install: The format file of 'multex' is NOT built successfully."
+ skip_distupgrade "#668791: multex-bin: fails to install: The format file of 'multex' is NOT built successfully."
+ ;;
+ naist-jdic|\
+ naist-jdic-utf8|\
+ chasen)
+ skip_distupgrade "#929614: naist-jdic: 0.4.3-4 (lenny) was overwritten by 1:0.4.3-4 (jessie) on archive.debian.org"
;;
python-milter|\
spf-milter-python)
- skip_always "python-milter contains virus signatures that may get blocked by the firewall"
+ skip_always "python-milter contains virus samples that may get blocked by the firewall"
;;
runit-run)
- skip_distupgrade "#542157: fails to install"
+ skip_distupgrade "#542157: runit-run: fails to install"
;;
sun-java5-doc|\
sun-java6-doc)
- skip_distupgrade "#709967: fails to install: download location no longer available"
+ skip_distupgrade "#709967: ${PIUPARTS_OBJECTS%%=*}: fails to install: download location no longer available"
;;
trn)
- skip_distupgrade "fails to install: prompts without using debconf"
+ skip_distupgrade "#688563: trn: fails to install: prompts without using debconf"
;;
ttf-root-installer)
- skip_distupgrade "#678807: fails to install: ftp:// download location disappeared"
+ skip_distupgrade "#678807: ttf-root-installer: fails to install: ftp:// download location disappeared"
;;
esac
@@ -99,10 +104,10 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "squeeze" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
distributed-net)
- skip_distupgrade "#655922: noninteractive install: postinst loops infinitely"
+ skip_distupgrade "#655922: distributed-net: noninteractive install: postinst loops infinitely"
;;
firmware-b43-lpphy-installer)
- skip_distupgrade "#623703: download location no longer available"
+ skip_distupgrade "#623703: firmware-b43-lpphy-installer: download location no longer available"
;;
fossology|\
fossology-agents|\
@@ -111,7 +116,7 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "squeeze" ]; then
fossology-web|\
fossology-web-single)
# removed after squeeze
- skip_distupgrade "#595593: fails to install"
+ skip_distupgrade "#595593: fossology: fails to install"
;;
libdbd-oracle-perl|\
ora2pg)
@@ -129,17 +134,17 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "wheezy" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
firmware-b43-lpphy-installer)
- skip_distupgrade "#623703: download location no longer available"
+ skip_distupgrade "#623703: firmware-b43-lpphy-installer: download location no longer available"
;;
geoip-database-contrib)
- skip_distupgrade "#885441: download location no longer available"
+ skip_distupgrade "#885441: geoip-database-contrib: download location no longer available"
;;
libdbd-oracle-perl|\
ora2pg)
skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient11.2-basic"
;;
nautilus-dropbox)
- skip_distupgrade "#770402: downloads awfully slow, hangs during installation"
+ skip_distupgrade "#770402: nautilus-dropbox: downloads awfully slow, hangs during installation"
;;
esac
@@ -152,7 +157,7 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "jessie" ]; then
skip_distupgrade "#929139: fusionforge-plugin-mediawiki: uninstallable cruft package"
;;
geoip-database-contrib)
- skip_distupgrade "#885441: download location no longer available"
+ skip_distupgrade "#885441: geoip-database-contrib: download location no longer available"
;;
steam)
skip_distupgrade "#772598: cannot preseed licence acceptance"
@@ -168,15 +173,24 @@ if [ "${PIUPARTS_DISTRIBUTION}" = "stretch" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
geoip-database-contrib)
- skip_distupgrade "#885441: download location no longer available"
+ skip_distupgrade "#885441: geoip-database-contrib: download location no longer available"
;;
libdbd-oracle-perl|\
- libdbd-oracle-perl-dbgsym|\
ora2pg)
skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
;;
llvm-3.7-examples)
- skip_distupgrade "#929138: uninstallable on !arm*"
+ skip_distupgrade "#929138: llvm-3.7-examples: uninstallable on !arm*"
+ ;;
+ esac
+
+fi
+
+if [ "${PIUPARTS_DISTRIBUTION}" = "stretch-debug" ]; then
+
+ case ${PIUPARTS_OBJECTS%%=*} in
+ libdbd-oracle-perl-dbgsym)
+ skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
;;
esac
@@ -185,7 +199,16 @@ fi
if [ "${PIUPARTS_DISTRIBUTION}" = "buster" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
- libdbd-oracle-perl|\
+ libdbd-oracle-perl)
+ skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
+ ;;
+ esac
+
+fi
+
+if [ "${PIUPARTS_DISTRIBUTION}" = "buster-debug" ]; then
+
+ case ${PIUPARTS_OBJECTS%%=*} in
libdbd-oracle-perl-dbgsym)
skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
;;
@@ -196,7 +219,16 @@ fi
if [ "${PIUPARTS_DISTRIBUTION}" = "sid" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
- libdbd-oracle-perl|\
+ libdbd-oracle-perl)
+ skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
+ ;;
+ esac
+
+fi
+
+if [ "${PIUPARTS_DISTRIBUTION}" = "sid-debug" ]; then
+
+ case ${PIUPARTS_OBJECTS%%=*} in
libdbd-oracle-perl-dbgsym)
skip_always "libdbd-oracle-perl/contrib depends on third-party oracle-instantclient12.1-basic"
;;
@@ -241,7 +273,7 @@ case ${PIUPARTS_OBJECTS%%=*}@${PIUPARTS_DISTRIBUTION} in
dms-dr at jessie|\
dms-wsgi at jessie)
# fixed after jessie, not in stable after jessie
- skip_distupgrade '#852519: fails to install: NZST FATAL: configuration file "/etc/postgresql/9.4/dms/postgresql.conf" contains errors'
+ skip_distupgrade '#852519: dms-core: fails to install: NZST FATAL: configuration file "/etc/postgresql/9.4/dms/postgresql.conf" contains errors'
;;
docbookwiki at lenny)
# removed after lenny
=====================================
custom-scripts/scripts/pre_install_exceptions
=====================================
@@ -52,6 +52,17 @@ case ${PIUPARTS_OBJECTS%%=*} in
;;
esac
+if [ "$PIUPARTS_DISTRIBUTION" = "jessie-backports" ]; then
+
+ case ${PIUPARTS_OBJECTS%%=*} in
+ libudev1)
+ log_debug
+ apt-get -y -t $PIUPARTS_DISTRIBUTION install udev systemd
+ ;;
+ esac
+
+fi
+
if [ "$PIUPARTS_DISTRIBUTION" = "wheezy-backports" ]; then
case ${PIUPARTS_OBJECTS%%=*} in
=====================================
custom-scripts/scripts/pre_remove_exceptions
=====================================
@@ -45,7 +45,22 @@ case ${PIUPARTS_OBJECTS%%=*} in
esac
case "$PIUPARTS_DISTRIBUTION" in
+ jessie*)
+ # prevent failure of 'apt-get --reinstall install systemd-sysv systemd'
+ # due to spurious dependency cycle (#237470)
+ case ${PIUPARTS_OBJECTS%%=*} in
+ file-rc|\
+ live-config|\
+ live-config-upstart|\
+ upstart)
+ log_debug
+ apt-get -y install systemd-sysv
+ ;;
+ esac
+ ;;
+esac
+case "$PIUPARTS_DISTRIBUTION" in
lenny*|squeeze*|wheezy*|jessie*)
# --allow-remove-essential was added in apt 1.1 (stretch)
;;
=====================================
master-bin/reschedule_piuparts_tests.in
=====================================
@@ -25,6 +25,7 @@ get_config_value SECTIONS global sections
get_config_value TESTING global testing-suite
dryrun=""
+logfiles=""
current=""
longterm=""
@@ -62,6 +63,10 @@ do
shift
dryrun="yes"
;;
+ --logfiles)
+ shift
+ logfiles="yes"
+ ;;
*)
break
;;
@@ -70,14 +75,38 @@ done
test -n "$1" || exit 1
+TOTAL=0
+recycle_logfiles()
+{
+ local log recycle
+ for log in "$@"
+ do
+ recycle="$(dirname "$(dirname "$log")")/recycle"
+ if [ -f "$log" ] && [ ! -f "$recycle/$(basename $log)" ]; then
+ TOTAL=$(( $TOTAL + 1 ))
+ if [ -n "$dryrun" ]; then
+ echo "candidate: $log"
+ else
+ ln -fv "$log" $recycle/ || true
+ fi
+ fi
+ done
+}
+
+
+if [ -n "$logfiles" ]; then
+ recycle_logfiles "$@"
+fi
+
+
+if [ -z "$logfiles" ]; then
+
subdirs="$pass $fail $bugged $affected $untestable"
pattern=' ('"$1"')\.conf$'
-
#
# mark logs matching kpr tag $1 for recycling
#
-TOTAL=0
OLDPWD=$(pwd)
LIST=$(mktemp)
for SECTION in $SECTIONS ; do
@@ -112,21 +141,14 @@ for SECTION in $SECTIONS ; do
mkdir -p $searchdirs $SECTION/recycle
grep -rlE "$pattern" --include '*.kpr' $searchdirs | sed 's/\.kpr$/.log/' > $LIST
- for log in $(cat $LIST)
- do
- if [ -f "$log" ] && [ ! -f "$SECTION/recycle/$(basename $log)" ]; then
- TOTAL=$(( $TOTAL + 1 ))
- if [ -n "$dryrun" ]; then
- echo "candidate: $log"
- else
- ln -fv "$log" $SECTION/recycle/ || true
- fi
- fi
- done
+ recycle_logfiles $(cat $LIST)
cd "$OLDPWD"
done
rm -f $LIST
+fi
+
+
if [ "$TOTAL" -gt "0" ]; then
if [ -n "$dryrun" ]; then
echo "Found $TOTAL candidate logfiles for recycling."
=====================================
piupartslib/packagesdb.py
=====================================
@@ -300,15 +300,17 @@ class PackagesDB:
# some architectures or from third-party repositories
# HACK: this hardcoded list should be moved to some data file
_ignored_missing_dependencies = [
+ # non-linux
"kbdcontrol",
"vidcontrol",
- "oracle-instantclient-basic",
- "oracle-instantclient11.2-basic",
- "oracle-instantclient12.1-basic",
# jessie
"mediawiki",
# stretch
"llvm-3.7-dev",
+ # third-party
+ "oracle-instantclient-basic",
+ "oracle-instantclient11.2-basic",
+ "oracle-instantclient12.1-basic",
]
# keep in sync with piuparts-report.py: emphasize_reason()
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/c71831b34fffaeaa5689c88e2509077c8bf7b738...932a275ef1e9a7ee879fcc85051b7aabd0b1a930
--
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/c71831b34fffaeaa5689c88e2509077c8bf7b738...932a275ef1e9a7ee879fcc85051b7aabd0b1a930
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/20190530/e75a4b1b/attachment-0001.html>
More information about the Piuparts-devel
mailing list