summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-01 19:13:54 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-01 19:13:54 +0200
commita56594028e41fecc4f8513bbed81d32aee29f2fc (patch)
treef60aff0ef4d0765ae05008d95784c7b4b5d90d87
parent5df0758ed74523fd4e2718031c6e6516c5581abe (diff)
downloadjenkins.debian.net-a56594028e41fecc4f8513bbed81d32aee29f2fc.tar.xz
reproducible: install diffoscope in schroots too
-rwxr-xr-xbin/schroot-create.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index adecb729..341fe9a5 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -128,21 +128,21 @@ bootstrap() {
set -x
sudo chroot $CHROOT_TARGET apt-get update
# install diffoscope with all recommends...
- if [ "$1" = "debbindiff" ] ; then
- sudo chroot $CHROOT_TARGET apt-get install -y --install-recommends debbindiff
+ if [ "$1" = "diffoscope" ] ; then
+ sudo chroot $CHROOT_TARGET apt-get install -y --install-recommends diffoscope
fi
sudo chroot $CHROOT_TARGET apt-get install -y --no-install-recommends "$@" sudo
# always use diffoscope from unstable
- if [ "$SUITE" = "testing" ] && [ "$1" = "debbindiff" ] ; then
+ if [ "$SUITE" = "testing" ] && [ "$1" = "diffoscope" ] ; then
echo "deb $MIRROR unstable main" | sudo tee -a $CHROOT_TARGET/etc/apt/sources.list > /dev/null
sudo chroot $CHROOT_TARGET apt-get update
# install diffoscope from unstable without re-adding all recommends...
- sudo chroot $CHROOT_TARGET apt-get install -y -t unstable --no-install-recommends debbindiff || echo "Warning: diffoscope from unstable is uninstallable at the moment."
+ sudo chroot $CHROOT_TARGET apt-get install -y -t unstable --no-install-recommends diffoscope || echo "Warning: diffoscope from unstable is uninstallable at the moment."
fi
if ! $DEBUG ; then set +x ; fi
- if [ "$1" = "debbindiff" ] ; then
+ if [ "$1" = "diffoscope" ] ; then
echo
- sudo chroot $CHROOT_TARGET dpkg -l debbindiff
+ sudo chroot $CHROOT_TARGET dpkg -l diffoscope
echo
fi
# umount in reverse order