diff options
| author | Mattia Rizzolo <mattia@debian.org> | 2017-07-15 13:45:22 +0200 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@debian.org> | 2017-07-15 13:45:45 +0200 |
| commit | 36d88b06612905aa394a7cfbbc07a1c335a25f07 (patch) | |
| tree | 58eebc2445157da72dbd2be2a23fbc9b29768b14 /bin | |
| parent | 27d08749697d71b2b86204af6094634604c144f4 (diff) | |
| download | jenkins.debian.net-36d88b06612905aa394a7cfbbc07a1c335a25f07.tar.xz | |
reproducible debian: fixup installation of unstable/experimental versions of diffoscope for stable/testing releases
previously it would really work only for experimental
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/schroot-create.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh index e956adce..a484c4af 100755 --- a/bin/schroot-create.sh +++ b/bin/schroot-create.sh @@ -183,18 +183,19 @@ 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 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" != "unstable" ] && [ "$SUITE" != "experimental" ]) && [ "$1" = "diffoscope" ] ; then + if ([ "$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... sudo chroot $SCHROOT_TARGET apt-get install -y -t unstable --no-install-recommends diffoscope || echo "Warning: diffoscope from unstable is uninstallable at the moment." fi + 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." + fi if ! $DEBUG ; then set +x ; fi if [ "$1" = "diffoscope" ] ; then echo |