From 1df9ae4bc7c5f59e6d47a8cf0912625a64ecbb75 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 14 Feb 2009 23:16:13 +0000 Subject: (easy_add_callback_with_mirror,easy_add_callback) honnor canceling when the user closed the "updates/full_sources" dialog (#47125) --- NEWS | 2 ++ Rpmdrake/edit_urpm_sources.pm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 3c5ed878..5db89628 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ - edit-urpm-sources: o do not use the same shortcut for "Add a specific "media mirror" and "_Add a custom medium" menu entries (#46027) + o honnor canceling when the user closed the "updates/full_sources" + dialog (#47125) o honnor canceling when the user refused to access the network when adding a specific mirror from the menubar (#46027) diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm index 9c4430f1..02af4f01 100644 --- a/Rpmdrake/edit_urpm_sources.pm +++ b/Rpmdrake/edit_urpm_sources.pm @@ -129,6 +129,7 @@ sub easy_add_callback_with_mirror() { #- cooker and community don't have update sources my $want_base_distro = _want_base_distro(); + defined $want_base_distro or return; my $distro = $rpmdrake::mandrake_release; my ($mirror) = choose_mirror($urpm, message => N("This will attempt to install all official sources corresponding to your @@ -154,6 +155,7 @@ sub easy_add_callback() { #- cooker and community don't have update sources my $want_base_distro = _want_base_distro(); + defined $want_base_distro or return; warn_for_network_need(undef, transient => $::main_window) or return; my $wait = wait_msg(N("Please wait, adding media...")); add_distrib_update_media($urpm, undef, if_(!$want_base_distro, only_updates => 1)); -- cgit v1.2.1