diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | urpm/media.pm | 6 |
2 files changed, 3 insertions, 4 deletions
@@ -1,5 +1,6 @@ - urpmi o in --auto, do display an error message when rpms are missing + o revert --auto-update behaviour in case of media update failures (#45417) Version 6.18 - 28 October 2008 diff --git a/urpm/media.pm b/urpm/media.pm index e44ae246..2d710212 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -620,7 +620,7 @@ sub configure { my @remaining = difference2($urpm->{media}, \@sorted_media); $urpm->{media} = [ @sorted_media, @remaining ]; } - _auto_update_media($urpm, %options) or return; + _auto_update_media($urpm, %options); _pick_mirror_if_needed($urpm, $_, '') foreach non_ignored_media($urpm, $options{update}); @@ -640,12 +640,10 @@ sub _auto_update_media { $options{callback} = delete $options{download_callback}; - my $errors; foreach (grep { $_->{force_auto_update} || _is_remote_virtual($_) || $urpm->{options}{'auto-update'} } non_ignored_media($urpm, $options{update})) { - _update_medium($urpm, $_, %options) or $errors++; + _update_medium($urpm, $_, %options); } - !$errors; } sub non_ignored_media { |