From 961e7d098addcf21c9f71fc96269f8a9b6cd3ca5 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 19 Apr 2008 19:32:03 +0000 Subject: remove DefaultWgetArgs, move the stuff to wgetrc git-svn-id: svn://tug.org/texlive/trunk@7531 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLConfig.pm | 6 ------ Master/tlpkg/TeXLive/TLUtils.pm | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'Master/tlpkg/TeXLive') diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 557098e1163..f5287fe9534 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -25,7 +25,6 @@ BEGIN { $DiskArchive $TeXLiveURL $TeXLiveAlternativeURL - $DefaultWgetArgs ); @EXPORT = @EXPORT_OK; } @@ -63,11 +62,6 @@ our $TeXLiveAlternativeURL; #our $TeXLiveAlternativeURL = 'http://www.ctan.org/systems/texlive/tlnet/2008'; -# defualt wget args -# we assume that the FIRST argument given AFTER the default args is the -# destination, ie where to put the file! -our $DefaultWgetArgs = "--tries=2 --timeout=60 -q -O"; - 1; diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index f9d9d950438..c92c12b4c30 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -769,7 +769,8 @@ sub _download_file { } my $wget = $ENV{"TL_DOWNLOAD_PROGRAM"} || $wgetdefault; - my $wgetargs = $ENV{"TL_DOWNLOAD_ARGS"} || $DefaultWgetArgs; + # we set now the args in installer/wgetrc + my $wgetargs = $ENV{"TL_DOWNLOAD_ARGS"} || ""; tllog($::LOG_DEBUG, "Trying to download $url\n"); -- cgit v1.2.3