From 500cba9448af25e460962c25a478b826dfe3bd71 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 29 Jan 2008 22:25:45 +0000 Subject: (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 --- Rpmdrake/edit_urpm_sources.pm | 2 +- Rpmdrake/pkg.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Rpmdrake') 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. -- cgit v1.2.1