summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-23 23:12:37 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-23 23:12:37 +0200
commit2ef22a0e1d1ac1845a717da0952ad2b2d3f98c92 (patch)
tree1df5f31465ca3d9a747018b4032f08a21e816597
parentb0cec7d8186e8a254325a3210ef41666305ff60f (diff)
downloadjenkins.debian.net-2ef22a0e1d1ac1845a717da0952ad2b2d3f98c92.tar.xz
reproducible: install sudo and diffoscope in two steps two minimize impact if one is not available
-rwxr-xr-xbin/schroot-create.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index c533d2e5..d523a04e 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