summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--urpm/media.pm8
2 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index d31248f9..ffe7a5a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
- compress sources with xz instead of bzip2
+- fix (g)urpmi --auto-select --update defaulting to all media when
+ there're no update media (#1024)
Version 6.39 - 21 November 2010
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 {