diff options
author | Thierry Vignaud <tv@mandriva.org> | 2008-10-01 13:36:47 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2008-10-01 13:36:47 +0000 |
commit | 513a2f62b591dbb16306a001cf40d3b33c3ae217 (patch) | |
tree | 84a796b9be2318622cc26dcaadbb7ae4ee19ff5b | |
parent | 60f7967f79f1a7c057b70fb859b6f09352725d53 (diff) | |
download | rpmdrake-513a2f62b591dbb16306a001cf40d3b33c3ae217.tar rpmdrake-513a2f62b591dbb16306a001cf40d3b33c3ae217.tar.gz rpmdrake-513a2f62b591dbb16306a001cf40d3b33c3ae217.tar.bz2 rpmdrake-513a2f62b591dbb16306a001cf40d3b33c3ae217.tar.xz rpmdrake-513a2f62b591dbb16306a001cf40d3b33c3ae217.zip |
(easy_add_callback) default is now using mirror list
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | Rpmdrake/edit_urpm_sources.pm | 15 |
2 files changed, 4 insertions, 13 deletions
@@ -1,5 +1,7 @@ - rpmdrake: o use radio buttons in order to show current search mode +- edit_urpm_sources: + o default to use mirrorlist Version 4.21 - 30 September 2008, Thierry Vignaud diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm index 6b11e639..d4ad889a 100644 --- a/Rpmdrake/edit_urpm_sources.pm +++ b/Rpmdrake/edit_urpm_sources.pm @@ -154,20 +154,9 @@ sub easy_add_callback() { #- cooker and community don't have update sources my $want_base_distro = _want_base_distro(); - my $distro = $rpmdrake::mandrake_release; - my ($mirror) = choose_mirror($urpm, message => -N("This will attempt to install all official sources corresponding to your -distribution (%s). - -I need to contact the Mandriva website to get the mirror list. -Please check that your network is currently running. - -Is it ok to continue?", $distro), - transient => $::main_window, - ) or return 0; - ref $mirror or return; + warn_for_network_need() or return; my $wait = wait_msg(N("Please wait, adding media...")); - add_distrib_update_media($urpm, $mirror, if_(!$want_base_distro, only_updates => 1)); + add_distrib_update_media($urpm, undef, if_(!$want_base_distro, only_updates => 1)); $offered_to_add_sources->[0] = 1; remove_wait_msg($wait); return 1; |