summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-09-14 06:44:50 +0000
committerThierry Vignaud <tv@mageia.org>2011-09-14 06:44:50 +0000
commitca051c7d00098f47ccd902aa6be39d7863764f21 (patch)
tree2477ad2799d7c7cf13d2f532883108216e4cc739 /urpm/media.pm
parent18bc6d79289ecf7457b5ec210dd3398ca36c86ef (diff)
downloadurpmi-ca051c7d00098f47ccd902aa6be39d7863764f21.tar
urpmi-ca051c7d00098f47ccd902aa6be39d7863764f21.tar.gz
urpmi-ca051c7d00098f47ccd902aa6be39d7863764f21.tar.bz2
urpmi-ca051c7d00098f47ccd902aa6be39d7863764f21.tar.xz
urpmi-ca051c7d00098f47ccd902aa6be39d7863764f21.zip
(configure,_auto_update_media,parse_media,update_media) fix (g)urpmi
--auto-select --update defaulting to all media when there're no update media (#1024) (syncing with currently shipped urpmi)
Diffstat (limited to 'urpm/media.pm')
-rw-r--r--urpm/media.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index ea9e1b81..d475c7b5 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -668,7 +668,7 @@ sub configure {
}
_auto_update_media($urpm, %options);
- _pick_mirror_if_needed($urpm, $_, '') foreach non_ignored_media($urpm);
+ _pick_mirror_if_needed($urpm, $_, '') foreach non_ignored_media($urpm, $options{update});
parse_media($urpm, \%options) if !$options{nodepslist};
@@ -687,7 +687,7 @@ sub _auto_update_media {
$options{callback} = delete $options{download_callback};
foreach (grep { _is_remote_virtual($_) || $urpm->{options}{'auto-update'} }
- non_ignored_media($urpm)) {
+ non_ignored_media($urpm, $options{update})) {
_update_medium($urpm, $_, %options);
}
}
@@ -710,7 +710,7 @@ sub all_media_to_update {
sub parse_media {
my ($urpm, $options) = @_;
- foreach (non_ignored_media($urpm)) {
+ foreach (non_ignored_media($urpm, $options->{update})) {
delete @$_{qw(start end)};
_parse_synthesis_or_ignore($urpm, $_, $options->{callback});
@@ -1871,7 +1871,7 @@ sub update_media {
$_->{modified} ||= 1 foreach all_media_to_update($urpm);
}
- update_those_media($urpm, [ grep { $_->{modified} } non_ignored_media($urpm) ], %options);
+ update_those_media($urpm, [ grep { $_->{modified} } non_ignored_media($urpm, $options{update}) ], %options);
}
sub update_those_media {