diff options
author | Norbert Preining <preining@logic.at> | 2008-04-19 19:32:03 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2008-04-19 19:32:03 +0000 |
commit | 961e7d098addcf21c9f71fc96269f8a9b6cd3ca5 (patch) | |
tree | 3e56c8a8c467f40b4e6c926d79101386f942fa35 /Master/tlpkg | |
parent | 05050decb6d08abf4e116348d4530142184db8fd (diff) |
remove DefaultWgetArgs, move the stuff to wgetrc
git-svn-id: svn://tug.org/texlive/trunk@7531 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 6 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 3 | ||||
-rw-r--r-- | Master/tlpkg/installer/wgetrc | 7 |
3 files changed, 8 insertions, 8 deletions
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"); diff --git a/Master/tlpkg/installer/wgetrc b/Master/tlpkg/installer/wgetrc index 7aeacc74e1d..eb4650e6920 100644 --- a/Master/tlpkg/installer/wgetrc +++ b/Master/tlpkg/installer/wgetrc @@ -28,7 +28,7 @@ # You can lower (or raise) the default number of retries when # downloading a file (default is 20). -#tries = 20 +tries = 2 # Lowering the maximum depth of the recursive retrieval is handy to # prevent newbies from going too "deep" when they unwittingly start @@ -110,3 +110,8 @@ waitretry = 10 # To have Wget follow FTP links from HTML files by default, set this # to on: #follow_ftp = off + +# +# timeout, not sure if this is evaluated +timeout = 60 + |