summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--scripts/gutsy6
-rw-r--r--scripts/sid6
3 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 01c5fa1..ddeaa44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
debootstrap (1.0.58) UNRELEASED; urgency=medium
* Policy version 3.9.5: no changes required.
+ * Install apt-transport-https if installing from an HTTPS mirror
+ (LP: #1135163). It may still be necessary to copy certificates into
+ place, but there's at least a reasonable chance that somebody installing
+ from HTTPS may want to keep using it, and we have to install
+ apt-transport-https at this point otherwise they won't be able to do
+ that end-to-end.
-- Colin Watson <cjwatson@debian.org> Sat, 08 Feb 2014 23:33:58 +0000
diff --git a/scripts/gutsy b/scripts/gutsy
index 597562c..69513f4 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -43,6 +43,12 @@ work_out_debs () {
elif doing_variant fakechroot || doing_variant minbase; then
base="apt"
fi
+
+ case $MIRRORS in
+ https://*)
+ base="$base apt-transport-https"
+ ;;
+ esac
}
first_stage_install () {
diff --git a/scripts/sid b/scripts/sid
index 70ae207..241f867 100644
--- a/scripts/sid
+++ b/scripts/sid
@@ -32,6 +32,12 @@ work_out_debs () {
# ldd.fake needs binutils
required="$required binutils"
fi
+
+ case $MIRRORS in
+ https://*)
+ base="$base apt-transport-https"
+ ;;
+ esac
}
first_stage_install () {