summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-31 10:59:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-31 10:59:08 +0000
commit131b63c689d770d09e9099ccbea2d4ca3b94254d (patch)
tree78c230aff909010df147b01d3d8b94e5be7306a6 /urpm
parent2bc5884ec3473c039254286d5d33fca59f473491 (diff)
downloadurpmi-131b63c689d770d09e9099ccbea2d4ca3b94254d.tar
urpmi-131b63c689d770d09e9099ccbea2d4ca3b94254d.tar.gz
urpmi-131b63c689d770d09e9099ccbea2d4ca3b94254d.tar.bz2
urpmi-131b63c689d770d09e9099ccbea2d4ca3b94254d.tar.xz
urpmi-131b63c689d770d09e9099ccbea2d4ca3b94254d.zip
- urpmi
o revert --auto-update behaviour in case of media update failures (#45417)
Diffstat (limited to 'urpm')
-rw-r--r--urpm/media.pm6
1 files changed, 2 insertions, 4 deletions
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 {