diff options
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | urpm/main_loop.pm | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,3 +1,5 @@ +- urpmi + o --auto: do not prompt for "retry" on aria2 download failure - urpmi_rpm-find-leaves o do not list suggested packages as unrequested packages (#46326) diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm index 69567d11..4a81ece0 100644 --- a/urpm/main_loop.pm +++ b/urpm/main_loop.pm @@ -100,13 +100,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) { $_->[0] = urpm::download::hide_password($_->[0]) foreach @error_sources; |