summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-23 22:37:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-23 22:37:52 +0000
commitf6d374b254fa4b5c6703652cc6e119dc85ee2404 (patch)
tree44dfad132140b0511af84bc26521d909a0f4062c
parentb549980870f105e0676584d9af73528fe52110e6 (diff)
downloadurpmi-f6d374b254fa4b5c6703652cc6e119dc85ee2404.tar
urpmi-f6d374b254fa4b5c6703652cc6e119dc85ee2404.tar.gz
urpmi-f6d374b254fa4b5c6703652cc6e119dc85ee2404.tar.bz2
urpmi-f6d374b254fa4b5c6703652cc6e119dc85ee2404.tar.xz
urpmi-f6d374b254fa4b5c6703652cc6e119dc85ee2404.zip
urpmf: fix mirrolist handling
-rw-r--r--NEWS3
-rw-r--r--urpm/media.pm5
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f14063e2..189fc99e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmf:
+ o fix mirrorlist handling
+
Version 5.5 - 23 February 2008, by Pascal "Pixel" Rigaux
- all tools:
diff --git a/urpm/media.pm b/urpm/media.pm
index c7995b52..93b84628 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -573,6 +573,9 @@ sub configure {
$urpm->{media} = [ @sorted_media, @remaining ];
}
_auto_update_media($urpm, %options) or return;
+
+ _pick_mirror_if_needed($urpm, $_, '') foreach grep { !$_->{ignore} } @{$urpm->{media}};
+
_parse_media($urpm, \%options) if !$options{nodepslist};
#- determine package to withdraw (from skip.list file) only if something should be withdrawn.
@@ -604,8 +607,6 @@ sub _parse_media {
delete @$_{qw(start end)};
_parse_synthesis_or_ignore($urpm, $_, $options->{callback});
- _pick_mirror_if_needed($urpm, $_, '');
-
if ($_->{searchmedia}) {
$urpm->{searchmedia} = 1;
$urpm->{log}(N("Search start: %s end: %s", $_->{start}, $_->{end}));