From 26ba75a1194098cd9f97417382250e43d652f3f3 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 15 Dec 2008 15:25:35 +0000
Subject: - urpmi   o --auto: do not prompt for "retry" on aria2 download
 failure

---
 NEWS              | 3 +++
 urpm/main_loop.pm | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index ddb73ef1..44f8cfe0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi
+  o --auto: do not prompt for "retry" on aria2 download failure
+
 Version 6.14.12 - 14 November 2008
 
 - urpmi, gurpmi
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index d9b32946..3d45084f 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -101,13 +101,13 @@ foreach my $set (@{$state->{transaction} || []}) {
 	\@error_sources,
 	quiet => $options{verbose} < 0,
 	callback => $callbacks->{trans_log},
-        ask_retry => $callbacks->{ask_retry} || sub {
+        ask_retry => !$urpm->{options}{auto} && ($callbacks->{ask_retry} || sub {
 	    my ($raw_msg, $msg) = @_;
 	    if (my $download_errors = delete $urpm->{download_errors}) {
 		$raw_msg = join("\n", @$download_errors, '');
 	    }
 	    $callbacks->{ask_yes_or_no}('', $raw_msg . "\n" . $msg . "\n" . N("Retry?"));
-	},
+	}),
     );
     if (@error_sources) {
 	$nok++;
-- 
cgit v1.2.1