|
|
@ -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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|