diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-02-14 23:06:12 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-02-14 23:06:12 +0000 |
| commit | 8550d870b3e74292353c237a1a3435253f8b2120 (patch) | |
| tree | 1b0bb3bb4161abd97bf9e02791171d73f193f0fa | |
| parent | 9d7fede6a09dbbc123ad2a94bea472898de2cc17 (diff) | |
| download | rpmdrake-8550d870b3e74292353c237a1a3435253f8b2120.tar rpmdrake-8550d870b3e74292353c237a1a3435253f8b2120.tar.gz rpmdrake-8550d870b3e74292353c237a1a3435253f8b2120.tar.bz2 rpmdrake-8550d870b3e74292353c237a1a3435253f8b2120.tar.xz rpmdrake-8550d870b3e74292353c237a1a3435253f8b2120.zip | |
(choose_mirror) honnor canceling when the user refused to access the
network when adding a specific mirror from the menubar (#46027)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | rpmdrake.pm | 2 |
2 files changed, 3 insertions, 1 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 refused to access the network when + adding a specific mirror from the menubar (#46027) Version 5.7 - 11 February 2009, Thierry Vignaud diff --git a/rpmdrake.pm b/rpmdrake.pm index 14e07fac..1a1899a3 100644 --- a/rpmdrake.pm +++ b/rpmdrake.pm @@ -604,7 +604,7 @@ sub choose_mirror { my ($urpm, %options) = @_; delete $options{message}; my @transient_options = exists $options{transient} ? (transient => $options{transient}) : (); - warn_for_network_need($options{message}, %options); + warn_for_network_need($options{message}, %options) or return; my @mirrors = eval { mirrors($urpm, $options{want_base_distro}) }; my $error = $@; if ($error) { |