diff options
author | Thierry Vignaud <tv@mandriva.org> | 2009-02-14 23:15:57 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2009-02-14 23:15:57 +0000 |
commit | 1b93fa3c77361f7caac951c9c95096beaf5f1683 (patch) | |
tree | 994714970127333456b55108e6c8224bdb619737 | |
parent | 704adf8b10e765ec5c4b8e744754a5147ef70d76 (diff) | |
download | rpmdrake-1b93fa3c77361f7caac951c9c95096beaf5f1683.tar rpmdrake-1b93fa3c77361f7caac951c9c95096beaf5f1683.tar.gz rpmdrake-1b93fa3c77361f7caac951c9c95096beaf5f1683.tar.bz2 rpmdrake-1b93fa3c77361f7caac951c9c95096beaf5f1683.tar.xz rpmdrake-1b93fa3c77361f7caac951c9c95096beaf5f1683.zip |
(easy_add_callback_with_mirror,easy_add_callback) honnor canceling
when the user closed the "updates/full_sources" dialog (#47125)
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | Rpmdrake/edit_urpm_sources.pm | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -3,6 +3,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 ae404b6e..36766f34 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)); |