diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-12-15 15:25:35 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-12-15 15:25:35 +0000 |
| commit | 26ba75a1194098cd9f97417382250e43d652f3f3 (patch) | |
| tree | 335ae2cc15cb71af9e018e13f4406c90502655f2 | |
| parent | af2fb0067f2cd8271c4cd0523579246f125366f1 (diff) | |
| download | urpmi-26ba75a1194098cd9f97417382250e43d652f3f3.tar urpmi-26ba75a1194098cd9f97417382250e43d652f3f3.tar.gz urpmi-26ba75a1194098cd9f97417382250e43d652f3f3.tar.bz2 urpmi-26ba75a1194098cd9f97417382250e43d652f3f3.tar.xz urpmi-26ba75a1194098cd9f97417382250e43d652f3f3.zip | |
- urpmi
o --auto: do not prompt for "retry" on aria2 download failure
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/main_loop.pm | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -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++; |