summaryrefslogtreecommitdiffstats
path: root/bin/schroot-create.sh
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2017-06-16 14:48:35 +0200
committerHolger Levsen <holger@layer-acht.org>2017-06-18 19:30:44 +0200
commit22b48c202a1c71b190b40a55ca8edeebb63fefa7 (patch)
tree7247bbfd5fcd280838c4fd09c597951c77484446 /bin/schroot-create.sh
parent412f53318d04abf448ea558f751715c54716e3f4 (diff)
downloadjenkins.debian.net-22b48c202a1c71b190b40a55ca8edeebb63fefa7.tar.xz
reproducible debian: introduce buster
Signed-off-by: Mattia Rizzolo <mattia@debian.org> Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/schroot-create.sh')
-rwxr-xr-xbin/schroot-create.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 94a2fbb6..e956adce 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -182,14 +182,14 @@ bootstrap() {
fi
robust_chroot_apt install -y --no-install-recommends sudo
robust_chroot_apt install -y --no-install-recommends $@
- # try to use diffoscope from experimental
- if ([ "$SUITE" = "unstable" ] || [ "$SUITE" = "stretch" ] ) && [ "$1" = "diffoscope" ] ; then
+ # try to use diffoscope from experimental if available
+ if [ "$SUITE" != "experimental" ] && [ "$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" = "stretch" ] && [ "$1" = "diffoscope" ] ; then
- # always try to use diffoscope from unstable on stretch
+ elif ([ "$SUITE" != "unstable" ] && [ "$SUITE" != "experimental" ]) && [ "$1" = "diffoscope" ] ; then
+ # always try to use diffoscope from unstable on stretch/buster
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...