summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-03 09:22:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-03 09:22:25 +0000
commit3e997f8f64500be9f345902af75fd4434fcff00b (patch)
tree2c1fb954ddfb5ab42ba8146154236858e7bd6a0f
parentaad2c29364f5fe14395533bcaa301ccd3a538bc6 (diff)
downloadurpmi-3e997f8f64500be9f345902af75fd4434fcff00b.tar
urpmi-3e997f8f64500be9f345902af75fd4434fcff00b.tar.gz
urpmi-3e997f8f64500be9f345902af75fd4434fcff00b.tar.bz2
urpmi-3e997f8f64500be9f345902af75fd4434fcff00b.tar.xz
urpmi-3e997f8f64500be9f345902af75fd4434fcff00b.zip
- really call aria2 with --max-tries=1
(it helps a lot when trying to download some files (eg: reconfig.urpmi))
-rw-r--r--NEWS3
-rw-r--r--urpm/download.pm3
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index c0c6126c..0a45e541 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- really call aria2 with --max-tries=1
+ (it helps a lot when trying to download some files (eg: reconfig.urpmi))
+
Version 6.6 - 1 September 2008, Pascal "Pixel" Rigaux
- call aria2 with brand-new --uri-selector=adaptive
diff --git a/urpm/download.pm b/urpm/download.pm
index e6c60e07..244cc45e 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -623,7 +623,7 @@ sub sync_aria2 {
"--auto-file-renaming=false",
"--follow-metalink=mem",
'--metalink-enable-unique-protocol=false', # so that it can try both ftp and http access on the same server. aria2 will only do this on first calls
- '--max-tries=1',
+ '--max-tries=1', # nb: not using $options->{retry}
'--lowest-speed-limit=20K', "--timeout", 3, # $CONNECT_TIMEOUT,
'-C3', # maximum number of servers to use for one download
'--uri-selector=adaptive', "--server-stat-if=$stat_file", "--server-stat-of=$stat_file",
@@ -631,7 +631,6 @@ sub sync_aria2 {
($options->{'limit-rate'} ? "--max-download-limit=" . $options->{'limit-rate'} : ()),
($options->{resume} ? "--continue" : "--allow-overwrite=true"),
($options->{proxy} ? set_proxy({ type => "aria2", proxy => $options->{proxy} }) : ()),
- ($options->{retry} ? "--max-tries=$options->{retry}" : "--max-tries=3"),
(defined $options->{'aria2-options'} ? split /\s+/, $options->{'aria2-options'} : ()),
@files);