[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: install debbindiff from sid in testing schroot for running debbindiff

[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 6983ee99b68dc7c4fa6fa4f878b3a27b836c551b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun May 17 23:46:45 2015 +0200

    reproducible: install debbindiff from sid in testing schroot for running debbindiff
---
 bin/reproducible_setup_schroot.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_setup_schroot.sh b/bin/reproducible_setup_schroot.sh
index a5d7986..abe5c18 100755
--- a/bin/reproducible_setup_schroot.sh
+++ b/bin/reproducible_setup_schroot.sh
@@ -60,10 +60,12 @@ bootstrap() {
 		set -x
 		sudo chroot $CHROOT_TARGET apt-get update
 		# install debbindiff with all recommends...
-		#sudo chroot $CHROOT_TARGET apt-get install -y --no-install-recommends "$@"
 		sudo chroot $CHROOT_TARGET apt-get install -y "$@"
 		if ! $DEBUG ; then set +x ; fi
 	else
+		#
+		# FIXME: this else block is unused - remove or merge everything else with schroot-create?
+		#
 		# schroot is used to download sources, so add our repo too
 		echo 'deb-src http://reproducible.alioth.debian.org/debian/ ./' > /etc/apt/sources.list.d/reproducible.list
 		TMPFILE=$(mktemp)
@@ -102,6 +104,16 @@ EOF
 		rm $TMPFILE
 		sudo chroot $CHROOT_TARGET apt-get update
 	fi
+	# use debbindiff from unstable
+	if [ "$SUITE" = "testing" ] ; then
+		echo "deb-src $MIRROR unstable main"        | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list > /dev/null
+		sudo chroot $CHROOT_TARGET apt-get update
+		# install debbindiff from unstable without re-adding all recommends...
+		sudo chroot $CHROOT_TARGET apt-get install -y -t unstable --no-install-recommends debbindiff
+	fi
+	echo
+	sudo chroot $CHROOT_TARGET dpkg -l debbindiff
+	echo
 
 	sudo umount -l $CHROOT_TARGET/proc
 }

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