From 1170aabd5592f21231e161c505c8454013a04c50 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 23 Jun 2011 02:41:33 +0000 Subject: use $TeXLive::TLConfig::NetworkTimeout consistently for wget, as it is also done for LWP git-svn-id: svn://tug.org/texlive/trunk@23102 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Master/tlpkg/TeXLive') diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 40f47ac6950..841d7666c38 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -2373,7 +2373,7 @@ sub _download_file my $wget = $ENV{"TL_DOWNLOAD_PROGRAM"} || $wgetdefault; my $wgetargs = $ENV{"TL_DOWNLOAD_ARGS"} - || "--user-agent=texlive/wget --tries=10 --timeout=900 -q -O"; + || "--user-agent=texlive/wget --tries=10 --timeout=$NetworkTimeout -q -O"; debug("downloading $url using $wget $wgetargs\n"); my $ret; @@ -3264,7 +3264,7 @@ sub query_ctan_mirror # we need the verbose output, so no -q. # do not reduce retries here, but timeout still seems desirable. my $mirror = $TeXLiveServerURL; - my $cmd = "$wget $mirror --timeout=60 -O " + my $cmd = "$wget $mirror --timeout=$NetworkTimeout -O " . (win32() ? "nul" : "/dev/null") . " 2>&1"; # @@ -3326,7 +3326,7 @@ sub check_on_working_mirror # so try wget and only check for the return value # please KEEP the / after $mirror, some ftp mirrors do give back # an error if the / is missing after ../CTAN/ - my $cmd = "$wget $mirror/ --timeout=60 -O " + my $cmd = "$wget $mirror/ --timeout=$NetworkTimeout -O " . (win32() ? "nul" : "/dev/null") . " 2>" . (win32() ? "nul" : "/dev/null"); my $ret = system($cmd); -- cgit v1.2.3