[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian: try to install+use diffoscope from experimental

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit d933ac20a638accb01dd063dedb56be26d78a9dd
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Mar 16 10:24:52 2017 +0100

    reproducible Debian: try to install+use diffoscope from experimental
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/schroot-create.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 67e5ab1..194b4f4 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -181,8 +181,14 @@ bootstrap() {
 		fi
 		robust_chroot_apt install -y --no-install-recommends sudo
 		robust_chroot_apt install -y --no-install-recommends $@
-		# always try to use diffoscope from unstable
-		if [ "$SUITE" = "testing" ] && [ "$1" = "diffoscope" ] ; then
+		# try to use diffoscope from experimental
+		if ([ "$SUITE" = "unstable" ] || [ "$SUITE" = "testing" ] ) && [ "$1" = "diffoscope" ] ; then
+			echo "deb $MIRROR experimental main"        | sudo tee -a $SCHROOT_TARGET/etc/apt/sources.list > /dev/null
+			robust_chroot_apt update
+			# install diffoscope from experimental without re-adding all recommends...
+			sudo chroot $SCHROOT_TARGET apt-get install -y -t experimental --no-install-recommends diffoscope || echo "Warning: diffoscope from experimental is uninstallable at the moment."
+		elif [ "$SUITE" = "testing" ] && [ "$1" = "diffoscope" ] ; then
+			# always try to use diffoscope from unstable on testing
 			echo "deb $MIRROR unstable main"        | sudo tee -a $SCHROOT_TARGET/etc/apt/sources.list > /dev/null
 			robust_chroot_apt update
 			# install diffoscope from unstable without re-adding all recommends...

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