aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-01-29 22:25:45 +0000
committerThierry Vignaud <tv@mandriva.org>2008-01-29 22:25:45 +0000
commit500cba9448af25e460962c25a478b826dfe3bd71 (patch)
tree69b372188b3062430940c1a7b9079ede92140761 /Rpmdrake
parentacdcd7674e0570d77686ab47140aa9c30b406710 (diff)
downloadrpmdrake-500cba9448af25e460962c25a478b826dfe3bd71.tar
rpmdrake-500cba9448af25e460962c25a478b826dfe3bd71.tar.gz
rpmdrake-500cba9448af25e460962c25a478b826dfe3bd71.tar.bz2
rpmdrake-500cba9448af25e460962c25a478b826dfe3bd71.tar.xz
rpmdrake-500cba9448af25e460962c25a478b826dfe3bd71.zip
(choose_mirror,mirrors) use urpm::download::sync() instead of
curl_download::download() in order to download mirror list from api.mandriva.com, thus using the downloader set up with urpmi instead of forcing curl, and using urpmi's proxy options
Diffstat (limited to 'Rpmdrake')
-rw-r--r--Rpmdrake/edit_urpm_sources.pm2
-rw-r--r--Rpmdrake/pkg.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm
index afc85805..deafbea2 100644
--- a/Rpmdrake/edit_urpm_sources.pm
+++ b/Rpmdrake/edit_urpm_sources.pm
@@ -122,7 +122,7 @@ of sources."),
my $distro = $rpmdrake::mandrake_release;
my $real_arch = arch();
$distro =~ s/$real_arch/$arch/;
- my ($mirror) = choose_mirror(message =>
+ my ($mirror) = choose_mirror($urpm, message =>
N("This will attempt to install all official sources corresponding to your
distribution (%s).
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 1db5b7e6..f0fffa7b 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -220,7 +220,7 @@ column).
Then, restart \"%s\".", N("Enabled"), $rpmdrake::myname_update));
myexit(-1);
}
- my ($mirror) = choose_mirror(transient => $w->{real_window} || $::main_window,
+ my ($mirror) = choose_mirror($urpm, transient => $w->{real_window} || $::main_window,
message => join("\n\n",
N("You have no configured update media. MandrivaUpdate cannot operate without any update media."),
N("I need to contact the Mandriva website to get the mirror list.