diff options
author | Thierry Vignaud <tv@mageia.org> | 2013-03-16 09:03:19 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2013-03-16 09:03:19 +0000 |
commit | a502e85fbd3a6900e95954ca09b04ed8fc5cbe8d (patch) | |
tree | 2b1bdb2641d5a28da9f70d24b2133092dd867c3b /urpm/media.pm | |
parent | f4ba56915b3bc0c1b286265c08c41c9bca6687c2 (diff) | |
download | urpmi-a502e85fbd3a6900e95954ca09b04ed8fc5cbe8d.tar urpmi-a502e85fbd3a6900e95954ca09b04ed8fc5cbe8d.tar.gz urpmi-a502e85fbd3a6900e95954ca09b04ed8fc5cbe8d.tar.bz2 urpmi-a502e85fbd3a6900e95954ca09b04ed8fc5cbe8d.tar.xz urpmi-a502e85fbd3a6900e95954ca09b04ed8fc5cbe8d.zip |
fix lookup deps of updates in other media when using --update
reverting commit r1931 from 2011-09-14:
"(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)"
Diffstat (limited to 'urpm/media.pm')
-rw-r--r-- | urpm/media.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/urpm/media.pm b/urpm/media.pm index 7898b194..5bfd1b38 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -731,7 +731,7 @@ sub configure { } _auto_update_media($urpm, %options); - _pick_mirror_if_needed($urpm, $_, '') foreach non_ignored_media($urpm, $options{update}); + _pick_mirror_if_needed($urpm, $_, '') foreach non_ignored_media($urpm); if (!$options{nodepslist}) { parse_media($urpm, \%options); @@ -750,7 +750,7 @@ sub _auto_update_media { $options{callback} = delete $options{download_callback}; foreach (grep { _is_remote_virtual($_) || $urpm->{options}{'auto-update'} } - non_ignored_media($urpm, $options{update})) { + non_ignored_media($urpm)) { _update_medium($urpm, $_, %options); } } @@ -770,7 +770,7 @@ sub all_media_to_update { sub parse_media { my ($urpm, $options) = @_; - foreach (non_ignored_media($urpm, $options->{update})) { + foreach (non_ignored_media($urpm)) { delete @$_{qw(start end)}; _parse_synthesis_or_ignore($urpm, $_, $options->{callback}); @@ -2025,7 +2025,7 @@ sub update_media { $_->{modified} ||= 1 foreach all_media_to_update($urpm); } - update_those_media($urpm, [ grep { $_->{modified} } non_ignored_media($urpm, $options{update}) ], %options); + update_those_media($urpm, [ grep { $_->{modified} } non_ignored_media($urpm) ], %options); } sub update_those_media { |