diff options
author | Christophe Fergeau <cfergeau@mandriva.com> | 2009-10-21 09:51:32 +0000 |
---|---|---|
committer | Christophe Fergeau <cfergeau@mandriva.com> | 2009-10-21 09:51:32 +0000 |
commit | e997e8b4cc32ea3ec4bd0208a1c425af5a60a004 (patch) | |
tree | 3519dd0c29ecc72e058d45f985d1d402033e3f31 | |
parent | 504f48236193a06fa98526074aa2613c77b3c7d1 (diff) | |
download | urpmi-e997e8b4cc32ea3ec4bd0208a1c425af5a60a004.tar urpmi-e997e8b4cc32ea3ec4bd0208a1c425af5a60a004.tar.gz urpmi-e997e8b4cc32ea3ec4bd0208a1c425af5a60a004.tar.bz2 urpmi-e997e8b4cc32ea3ec4bd0208a1c425af5a60a004.tar.xz urpmi-e997e8b4cc32ea3ec4bd0208a1c425af5a60a004.zip |
make sure we don't use aria2 to fetch mirrorlists
aria2 downloader currently doesn't work when we append a reason string
to the api.mandriva.com URL, lamely fix that by making sure it's not
used when grabbing a mirrorlist
-rw-r--r-- | urpm/download.pm | 2 | ||||
-rw-r--r-- | urpm/mirrors.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/urpm/download.pm b/urpm/download.pm index a0c93975..03b2eac0 100644 --- a/urpm/download.pm +++ b/urpm/download.pm @@ -896,7 +896,7 @@ sub sync_rel_one { sub sync_url { my ($urpm, $url, %options) = @_; - sync_rel_one($urpm, { url => dirname($url) }, basename($url), %options); + sync_rel_one($urpm, { url => dirname($url), $options{'allow-metalink'}?('allow-metalink' => $options{'allow-metalink'}):() }, basename($url), %options); } sub sync_rel_to { diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm index f17240b2..ac0a1d83 100644 --- a/urpm/mirrors.pm +++ b/urpm/mirrors.pm @@ -274,7 +274,7 @@ sub _mirrors_raw { my ($urpm, $url) = @_; $urpm->{log}(N("getting mirror list from %s", $url)); - my @l = urpm::download::get_content($urpm, $url) or $urpm->{error}("mirror list not found"); + my @l = urpm::download::get_content($urpm, $url, "allow_metalink" => 0) or $urpm->{error}("mirror list not found"); @l; } |