[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: install sudo and diffoscope in two steps two minimize impact if one is not available

Holger Levsen holger at moszumanska.debian.org
Wed Sep 23 21:13:19 UTC 2015


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 2ef22a0e1d1ac1845a717da0952ad2b2d3f98c92
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Sep 23 23:12:37 2015 +0200

    reproducible: install sudo and diffoscope in two steps two minimize impact if one is not available
---
 bin/schroot-create.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index c533d2e..d523a04 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -156,7 +156,8 @@ bootstrap() {
 		if [ "$1" = "diffoscope" ] ; then
 			robust_chroot_apt install -y --install-recommends diffoscope
 		fi
-		robust_chroot_apt install -y --no-install-recommends "$@ sudo"
+		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
 			echo "deb $MIRROR unstable main"        | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list > /dev/null

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



More information about the Qa-jenkins-scm mailing list