josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

explicitly inform the user why apt-transport-https or apt-transport-tor are getting installed

Browse source
This commit is contained in:
Johannes 'josch' Schauer 2020-04-10 12:55:52 +02:00
parent 9195972bef
commit f1a952d468
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mmdebstrap
View file

@ -2295,6 +2295,8 @@ sub run_install() {
or error "cannot start apt-get indextargets: $!"; or error "cannot start apt-get indextargets: $!";
while (my $uri = <$pipe_apt>) { while (my $uri = <$pipe_apt>) {
if ($uri =~ /^https:\/\//) { if ($uri =~ /^https:\/\//) {
info "https mirror found -- adding apt-transport-https "
. "and ca-certificates";
# FIXME: support for https is part of apt >= 1.5 # FIXME: support for https is part of apt >= 1.5
push @pkgs_to_install_from_outside, 'apt-transport-https'; push @pkgs_to_install_from_outside, 'apt-transport-https';
push @pkgs_to_install_from_outside, 'ca-certificates'; push @pkgs_to_install_from_outside, 'ca-certificates';
@ -2302,6 +2304,7 @@ sub run_install() {
} elsif ($uri =~ /^tor(\+[a-z]+)*:\/\//) { } elsif ($uri =~ /^tor(\+[a-z]+)*:\/\//) {
# tor URIs can be tor+http://, tor+https:// or even # tor URIs can be tor+http://, tor+https:// or even
# tor+mirror+file:// # tor+mirror+file://
info "tor mirror found -- adding apt-transport-tor";
push @pkgs_to_install_from_outside, 'apt-transport-tor'; push @pkgs_to_install_from_outside, 'apt-transport-tor';
last; last;
} }