From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 13 Feb 2018 08:54:39 +0000 (+0100)
Subject: Install apt-transport-https in the buildd chroots
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7da048e7ef96780f9b79af12785ea03be383430b;p=mirror%2Fdsa-puppet.git

Install apt-transport-https in the buildd chroots

This will be used to access the security archive in a more private way.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index a3187dd5f..1df01728e 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -383,6 +383,16 @@ chmod +x "$rootdir/usr/local/sbin/policy-rc.d"
 [ -z "$bare" ] && [ -z "$ubuntu" ] && chroot "$rootdir" apt-get install -y --no-install-recommends locales-all
 chroot "$rootdir" apt-get install -y --no-install-recommends build-essential
 [ -z "$bare" ] && chroot "$rootdir" apt-get install -y --no-install-recommends zsh less vim fakeroot devscripts gdb
+if [ -n "$buildd" ] ; then
+    case "$suite" in
+      wheezy|jessie|strech)
+        chroot "$rootdir" apt-get install -y --no-install-recommends apt-transport-https
+        ;;
+      *)
+        # Nothing to do, https support is part of the apt package
+        ;;
+    esac
+fi
 rm -f "$rootdir/etc/apt/sources.list" "$rootdir/etc/apt/sources.list.d/*"
 chroot "$rootdir" apt-get clean
 umount "$rootdir/dev" 2>/dev/null || true