From 5a3b067e65a75ce1c3ac44359bcb0e711252857c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 14 Mar 2010 15:52:58 +0000 Subject: turn on persistent download connections by default, document how to turn them off, and change user agent strings for wget to "texlive/wget" and use "texlive/lwp" for the new method git-svn-id: svn://tug.org/texlive/trunk@17455 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 21 ++++++++++++++------- Master/texmf/scripts/texlive/tlmgr.pl | 20 ++++++++++++++------ Master/tlpkg/TeXLive/TLUtils.pm | 2 +- 3 files changed, 29 insertions(+), 14 deletions(-) (limited to 'Master') diff --git a/Master/install-tl b/Master/install-tl index 14c484f539c..4abcb420365 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -158,7 +158,7 @@ my $opt_scheme = ""; my $opt_custom_bin; my $opt_version = 0; my $opt_force_arch; -my $opt_persistent_downloads = 0; +my $opt_persistent_downloads = 1; # show all options even those not relevant for that arch $::opt_all_options = 0; @@ -212,7 +212,7 @@ GetOptions( "profile=s" => \$opt_profile, "scheme=s" => \$opt_scheme, "all-options" => \$::opt_all_options, - "persistent-downloads" => \$opt_persistent_downloads, + "persistent-downloads!" => \$opt_persistent_downloads, "version" => \$opt_version, "help|?" => \$opt_help) or pod2usage(1); @@ -2007,11 +2007,18 @@ the postinstall actions. =item B<--persistent-downloads> -For net installs, try to set up a persistent connection using the -Net::LWP Perl module. This reuses a connection between your computer -and the server for the session, instead of initiating a new download for -each package. We hope this option will reduce the probability of -connection problems. +=item B<--no-persistent-downloads> + +For net installs, activating this option makes the installer try to set up a +persistent connection using the Net::LWP Perl module. +This opens only one connection between your computer and the server +per session and reuses it, instead of initiating a new download for +each package. + +This option is turned on by default, and the installation program will +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<-debug-translation> diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 36d71c8de7f..3b653e625f0 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -125,7 +125,7 @@ sub main { "location|repository|repo" => "=s", "machine-readable" => 1, "package-logfile" => "=s", - "persistent-downloads" => 1, + "persistent-downloads" => "!", "pause" => 1, "version" => 1, "help|h|?" => 1); @@ -202,6 +202,7 @@ sub main { TeXLive::TLUtils::process_logging_options(); + $opts{'persistent-downloads'} = 1; GetOptions(\%opts, keys(%optarg)) or pod2usage(2); $::debug_translation = 0; @@ -4412,11 +4413,18 @@ Windows to avoid command windows disappearing. =item B<--persistent-downloads> -For net installs, try to set up a persistent connection using the -Net::LWP Perl module. This reuses a connection between your computer -and the server for the session, instead of initiating a new download for -each package. We hope this option will reduce the probability of -connection problems. +=item B<--no-persistent-downloads> + +For net installs, activating this option makes tlmgr try to set up a +persistent connection using the Net::LWP Perl module. +This opens only one connection between your computer and the server +per session and reuses it, instead of initiating a new download for +each package. + +This option is turned on by default, and tlmgr will +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<--debug-translation> diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index c77c17a55b4..f674f04b10c 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -2252,7 +2252,7 @@ sub _download_file my $wget = $ENV{"TL_DOWNLOAD_PROGRAM"} || $wgetdefault; my $wgetargs = $ENV{"TL_DOWNLOAD_ARGS"} - || "--user-agent=texlive --tries=10 --timeout=900 -q -O"; + || "--user-agent=texlive/wget --tries=10 --timeout=900 -q -O"; debug("downloading $url using $wget $wgetargs\n"); my $ret; -- cgit v1.2.3