diff options
author | Holger Levsen <holger@layer-acht.org> | 2017-06-12 22:43:07 +0200 |
---|---|---|
committer | Holger Levsen <holger@layer-acht.org> | 2017-06-16 16:28:34 +0200 |
commit | fef02237f9f7aef649db16ba4162355f9a4deb2f (patch) | |
tree | f6d98b71946ee2544e15b7dfe6202268ffcd6a80 /bin/schroot-create.sh | |
parent | ef7fe352e2bb940ac2495e1f303d5ca7c8385b38 (diff) | |
download | jenkins.debian.net-fef02237f9f7aef649db16ba4162355f9a4deb2f.tar.xz |
reproducible Debian: WIP for s#testing#stretch#g - see TODO4stretch_rename.txt for status
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/schroot-create.sh')
-rwxr-xr-x | bin/schroot-create.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh index dcf11e74..94a2fbb6 100755 --- a/bin/schroot-create.sh +++ b/bin/schroot-create.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012-2016 Holger Levsen <holger@layer-acht.org> +# Copyright 2012-2017 Holger Levsen <holger@layer-acht.org> # Copyright 2013 Antonio Terceiro <terceiro@debian.org> # Copyright 2014 Joachim Breitner <nomeata@debian.org> # Copyright 2015 MAttia Rizzolo <mattia@mapreri.org> @@ -183,13 +183,13 @@ bootstrap() { 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" = "testing" ] ) && [ "$1" = "diffoscope" ] ; then + if ([ "$SUITE" = "unstable" ] || [ "$SUITE" = "stretch" ] ) && [ "$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 + elif [ "$SUITE" = "stretch" ] && [ "$1" = "diffoscope" ] ; then + # always try to use diffoscope from unstable on stretch 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... |