aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-02-14 23:06:47 +0000
committerThierry Vignaud <tv@mandriva.org>2009-02-14 23:06:47 +0000
commitce2516d23b0c8f22e2aecddda7072b8a15f00244 (patch)
tree91c97c41bc3f7ec12f5973631f239913b6a4f9af
parent0a8ff9c8fe748955f7d61ed989aac83423afe022 (diff)
downloadrpmdrake-ce2516d23b0c8f22e2aecddda7072b8a15f00244.tar
rpmdrake-ce2516d23b0c8f22e2aecddda7072b8a15f00244.tar.gz
rpmdrake-ce2516d23b0c8f22e2aecddda7072b8a15f00244.tar.bz2
rpmdrake-ce2516d23b0c8f22e2aecddda7072b8a15f00244.tar.xz
rpmdrake-ce2516d23b0c8f22e2aecddda7072b8a15f00244.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--NEWS4
-rw-r--r--rpmdrake.pm2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b47feb6c..3b547a18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- edit-urpm-sources:
+ o honnor canceling when the user refused to access the network when
+ adding a specific mirror from the menubar (#46027)
+
Version 5.0.5 - 10 February 2009, Thierry Vignaud
- edit-urpm-sources:
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 8ba96f26..8c152181 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -600,7 +600,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) {