- urpmi, gurpmi

  o retry once on aria2 versioned-file download failure

2 files changed, 15 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 73830530..dc07f448 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi, gurpmi
+  o retry once on aria2 versioned-file download failure
+
 Version 6.14.9 - 22 October 2008
 
 - urpmi, gurpmi
diff --git a/urpm/download.pm b/urpm/download.pm
index d7387645..54ceb4db 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -687,9 +687,16 @@ sub sync_aria2 {
     chdir $cwd;
     if (!close $aria2) {
 	my $raw_msg = _error_msg('aria2');
-	my $msg = N("Failed to download %s", $rel_files->[0]);
-	if ($options->{ask_retry} && $options->{ask_retry}($raw_msg, $msg)) {
-	    $options->{is_retry} = 1;
+	my $want_retry;
+	if (!$options->{is_retry} & $options->{is_versioned}) {
+	    $want_retry = 1;
+	} else {
+	    my $msg = N("Failed to download %s", $rel_files->[0]);
+	    $want_retry = $options->{ask_retry} && $options->{ask_retry}($raw_msg, $msg);
+	}
+	if ($want_retry) {
+	    $options->{is_retry}++;
+	    $options->{debug} and $options->{debug}("retrying ($options->{is_retry})");
 	    goto &sync_aria2;
 	}
 	die $raw_msg;
@@ -713,7 +720,7 @@ sub _parse_aria2_output {
 				  $medium->{mirrorlist} . ': ' . $medium->{'with-dir'} . "/$rel_files->[0]" :
 				  "$medium->{url}/$rel_files->[0]";
 				propagate_sync_callback($options, 'start', $file)
-				  if !delete $options->{is_retry};
+				  if !$options->{is_retry};
 			}
     		    if ($buf =~ m!^\[#\d*\s+\S+:([\d\.]+\w*).([\d\.]+\w*)\S([\d]+)\S+\s+\S+\s*([\d\.]+)\s\w*:([\d\.]+\w*/\w)\s\w*:(\d+\w*)\]$!) {
 			    my ($total, $percent, $speed, $eta) = ($2, $3, $5, $6);
@@ -727,6 +734,7 @@ sub _parse_aria2_output {
 		    if ($buf =~ m!Download\scomplete:\s\./!) {
 			propagate_sync_callback($options, 'end', $file);
 			shift @$rel_files;
+			delete $options->{is_retry};
 			$file = undef;			
 		    } elsif ($buf =~ /ERR\|(.*)/) {
 			propagate_sync_callback($options, 'error', $file, $1);