summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-21 15:35:22 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-21 15:35:22 +0000
commit0962c82ceaeed2a8a5d46280aa990c2f2e04f7cb (patch)
treebafe0548594225f9a097f804074167b3f19b4003
parent66654b50e3bef91af3e6d1b32fd7daa2b5b46f3a (diff)
downloaddrakx-0962c82ceaeed2a8a5d46280aa990c2f2e04f7cb.tar
drakx-0962c82ceaeed2a8a5d46280aa990c2f2e04f7cb.tar.gz
drakx-0962c82ceaeed2a8a5d46280aa990c2f2e04f7cb.tar.bz2
drakx-0962c82ceaeed2a8a5d46280aa990c2f2e04f7cb.tar.xz
drakx-0962c82ceaeed2a8a5d46280aa990c2f2e04f7cb.zip
(list,mirrors_raw) drop support for arch now that rpmdrake dropped it too
-rw-r--r--perl-install/mirror.pm10
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/mirror.pm b/perl-install/mirror.pm
index b61f24066..d725429f2 100644
--- a/perl-install/mirror.pm
+++ b/perl-install/mirror.pm
@@ -54,12 +54,11 @@ sub register_downloader {
}
sub mirrors_raw {
- my ($product_id, $o_arch) = @_;
+ my ($product_id) = @_;
#- contact the following URL to retrieve the list of mirrors.
#- http://wiki.mandriva.com/en/Product_id
my $type = lc($product_id->{type}); $type =~ s/\s//g;
- local $product_id->{arch} = $o_arch if $o_arch;
my $list = "http://api.mandriva.com/mirrors/$type.$product_id->{version}.$product_id->{arch}.list";
log::explanations("trying mirror list from $list");
my @lines;
@@ -84,14 +83,11 @@ sub mirrors_raw {
}
sub list {
- my ($product_id, $type, $o_arch) = @_;
+ my ($product_id, $type) = @_;
our @mirrors_raw;
- state $prev_arch;
- undef @mirrors_raw if $prev_arch ne $o_arch;
- $prev_arch = $o_arch || arch();
if (!@mirrors_raw) {
- @mirrors_raw = eval { mirrors_raw($product_id, $o_arch) };
+ @mirrors_raw = eval { mirrors_raw($product_id) };
if (my $err = $@) {
log::explanations("failed to download mirror list");
die $err;