diff options
Diffstat (limited to 'Master/texmf')
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 1615cd38038..4ffb20675bc 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -95,7 +95,6 @@ our $tlmediatlpdb; our $location; # location from which the new packages come our $localtlmedia; # local installation which we are munging our $localtlpdb; # local installation which we are munging -our @allow_ftp_args; # flags for machine-readable form our $FLAG_REMOVE = "d"; @@ -127,7 +126,6 @@ sub main { "machine-readable" => 1, "package-logfile" => "=s", "persistent-downloads" => "!", - "allow-ftp" => "!", "pause" => 1, "version" => 1, "help|h|?" => 1); @@ -355,26 +353,6 @@ sub main { if $do_persistent; } - # - # check for allowing ftp connections in the tlmgr config file and - # command line - { - my $do_ftp; - if (defined($opts{'allow-ftp'})) { - $do_ftp = ($opts{'allow-ftp'} ? 1 : 0); - } else { - if (defined($config{'allow-ftp'})) { - $do_ftp = $config{'allow-ftp'}; - } - } - # default is not to allow ftp mirrors - if (!defined($do_ftp)) { - $do_ftp = 0; - } - debug("are ftp mirrors are allowed: $do_ftp\n"); - push @allow_ftp_args, '-allow-ftp', $do_ftp; - } - execute_action($action, @ARGV); # end of main program. @@ -462,7 +440,7 @@ sub execute_action { } finish(0); } elsif ($action =~ m/^get-mirror$/i) { - my $loc = give_ctan_mirror(@allow_ftp_args); + my $loc = give_ctan_mirror(); print "$loc\n"; finish(0); } elsif ($action =~ m/^generate$/i) { @@ -4196,9 +4174,9 @@ sub init_tlmedia # choose a mirror if we are asked. if ($location =~ m/^ctan$/i) { - $location = give_ctan_mirror(@allow_ftp_args); + $location = give_ctan_mirror(); } elsif ($location =~ m,^$TeXLiveServerURL,) { - my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base(@allow_ftp_args); + my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base(); $location =~ s,^$TeXLiveServerURL,$mirrorbase,; } @@ -4416,12 +4394,6 @@ sub load_config_file } else { tlwarn("Unknown value $val for persistent-downloads in $fn\n"); } - } elsif ($key eq "allow-ftp") { - if (($val eq "0") || ($val eq "1")) { - $config{'allow-ftp'} = $val; - } else { - tlwarn("Unknown value $val for allow-ftp in $fn\n"); - } } else { tlwarn("Unknown key $key in $fn\n"); } @@ -4736,16 +4708,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. - -You can permanently turn this option on in the tlmgr config file, see -L<CONFIGURATION FILE> below for details. - =item B<--debug-translation> In GUI mode, this switch makes C<tlmgr> report any missing, or more @@ -5566,9 +5528,9 @@ All other lines must look like key = value -where the allowed keys are C<gui_expertmode>, C<persistent-downloads>, and -C<allow-ftp>. The values can only be 0 or 1 for those settings. -C<persistent-downloads> and C<allow-ftp> correspond to the respective +where the allowed keys are C<gui_expertmode> and C<persistent-downloads>. +The values can only be 0 or 1 for those settings. +C<persistent-downloads> corresponds to the respective command line options of C<tlmgr>. C<gui_expertmode> switches between the full GUI and a simplified with only the important and mostly used settings. |