remove the -allow-ftp and implement automatic fallback to http

operation:
 1. get a mirror (this retries 3 times to contact mirror.ctan.org)
    - if no mirror has been given, use one of the backbone servers
    - if it is an http server return it (no test!)
    - if it is a ftp server, continue below
 2. if the ftp mirror is good, return it
 3. if the ftp mirror is bad, search for http mirror (5 times)
 4. if http mirror is found, return it (no test!)
 5. if no http mirror is found return one of the backbone servers
THe above als changes the way mirror.ctan.org is contacted. If it
fails at first time it automatically retries 3 times to get a mirror.


git-svn-id: svn://tug.org/texlive/trunk@18467 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 3 insertions, 11 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 9efa22d2868..8c802f1bdc6 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -214,7 +214,6 @@ GetOptions(
            "scheme=s"       => \$opt_scheme,
            "all-options"    => \$::opt_all_options,
            "persistent-downloads!"      => \$opt_persistent_downloads,
-           "allow-ftp!"     => \$opt_allow_ftp,
            "version"        => \$opt_version,
            "help|?"         => \$opt_help) or pod2usage(1);
 
@@ -375,9 +374,9 @@ $location || ($location = "$::installerdir");
 if ($location =~ m!^(ctan$|(http|ftp)://)!i) {
   $location =~ s,/(tlpkg|archive)?/*$,,;  # remove any trailing tlpkg or /
   if ($location =~ m/^ctan$/i) {
-    $location = TeXLive::TLUtils::give_ctan_mirror('-allow-ftp' => $opt_allow_ftp);
+    $location = TeXLive::TLUtils::give_ctan_mirror();
   } elsif ($location =~ m/^$TeXLiveServerURL/) {
-    my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base('-allow-ftp' => $opt_allow_ftp);
+    my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base();
     $location =~ s,^($TeXLiveServerURL|ctan$),$mirrorbase,;
   }
   $TeXLiveURL = $location;
@@ -407,7 +406,7 @@ if ($location =~ m!^(ctan$|(http|ftp)://)!i) {
       die "$0: cannot find installation source at $opt_location.\n";
     }
     # no --location given, but NET installation
-    $TeXLiveURL = $location = TeXLive::TLUtils::give_ctan_mirror('-allow-ftp' => $opt_allow_ftp);
+    $TeXLiveURL = $location = TeXLive::TLUtils::give_ctan_mirror();
     $media = 'NET';
   }
 }
@@ -2027,13 +2026,6 @@ fall back to using wget if this is not possible. If you want to disable
 usage of LWP and persistent connections, please use
 B<--no-persistent-downloads>.
 
-=item B<-allow-ftp>
-
-By default if mirror.ctan.org is contacted only http mirrors are accepted.
-Adding this command line switch allows ftp mirrors of the CTAN nodes.
-
-If you set a ftp mirror explicitely, that one is in any case used.
-
 =item B<-debug-translation>
 
 In GUI mode, this switch makes C<tlmgr> report any missing, or more