summaryrefslogtreecommitdiffstats
path: root/urpm/media.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-15 05:51:56 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-15 05:51:56 +0000
commitd31e851a6fff8debe2dcaef709d474ede1cdc73e (patch)
tree951b7643d7b12fae2f8664a22dbadc99e2697a99 /urpm/media.pm
parentf23e0bbff40b3922f7612be4f12200d657f1d629 (diff)
downloadurpmi-d31e851a6fff8debe2dcaef709d474ede1cdc73e.tar
urpmi-d31e851a6fff8debe2dcaef709d474ede1cdc73e.tar.gz
urpmi-d31e851a6fff8debe2dcaef709d474ede1cdc73e.tar.bz2
urpmi-d31e851a6fff8debe2dcaef709d474ede1cdc73e.tar.xz
urpmi-d31e851a6fff8debe2dcaef709d474ede1cdc73e.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)" (backported from trunk)
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 b972883a..8f021bd7 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, $options{update});
+ _pick_mirror_if_needed($urpm, $_, '') foreach non_ignored_media($urpm);
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, $options{update})) {
+ non_ignored_media($urpm)) {
_update_medium($urpm, $_, %options);
}
}
@@ -710,7 +710,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});
@@ -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}) ], %options);
+ update_those_media($urpm, [ grep { $_->{modified} } non_ignored_media($urpm) ], %options);
}
sub update_those_media {