[Piuparts-commits] [piuparts] 07/08: squeeze: skip&fail install of mini-buildd-{bld, rep}

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 65bd15049a84f0027428fee63d68590ea8ae1b86
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Aug 5 05:03:42 2017 +0200

    squeeze: skip&fail install of mini-buildd-{bld,rep}
    
    deadlocks and runs into timeout
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/is_testable_uninstallable | 5 +++++
 custom-scripts/scripts/pre_install_exceptions    | 6 ------
 debian/changelog                                 | 2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/custom-scripts/scripts/is_testable_uninstallable b/custom-scripts/scripts/is_testable_uninstallable
index 191d451..41862c9 100755
--- a/custom-scripts/scripts/is_testable_uninstallable
+++ b/custom-scripts/scripts/is_testable_uninstallable
@@ -141,6 +141,11 @@ case ${PIUPARTS_OBJECTS%%=*}@${PIUPARTS_DISTRIBUTION} in
 	mhc at lenny)
 		skip_distupgrade "#696231: fails to install: emacs-package-install failure"
 		;;
+	mini-buildd-bld at squeeze|\
+	mini-buildd-rep at squeeze)
+		skip_distupgrade "#632955, #656746: time limit exceeded during install"
+		fail_test "#632955, #656746: time limit exceeded during install"
+		;;
 	multex-bin at lenny)
 		skip_distupgrade "#668791: fails to install: The format file of 'multex' is NOT built successfully."
 		;;
diff --git a/custom-scripts/scripts/pre_install_exceptions b/custom-scripts/scripts/pre_install_exceptions
index b8b72e9..91c21e5 100755
--- a/custom-scripts/scripts/pre_install_exceptions
+++ b/custom-scripts/scripts/pre_install_exceptions
@@ -163,12 +163,6 @@ if [ "$PIUPARTS_DISTRIBUTION" = "squeeze" ]; then
 				apt-get -y install bootcd-i386
 			fi
 			;;
-		mini-buildd-bld|mini-buildd-rep)
-			#632955, #656746 - time limit exceeded during install
-			log_debug
-			echo "*** ABORT - Installation would deadlock ***"
-			exit 1
-			;;
 	esac
 
 fi
diff --git a/debian/changelog b/debian/changelog
index 8ef41d7..a4b9cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ piuparts (0.79) UNRELEASED; urgency=medium
   * Move some exceptions to {pre,post}_test_exceptions.
   * scripts/post_distupgrade_base_cleanup: Remove pinentry-curses from the
     stretch (--install-recommends) reference chroot.
+  * scripts/is_testable_uninstallable:
+    - Skip and fail install of mini-buildd-{bld,rep} in squeeze.
   * scripts/post_purge_exceptions:
     - Restore /usr/lib/sasl2/ disappearing on some jessie->stretch upgrades.
   * scripts/is_testable_uninstallable:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git