aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2006-09-19 11:05:20 +0000
committerThierry Vignaud <tv@mandriva.org>2006-09-19 11:05:20 +0000
commit9711f0b5c5a1c4f36e7832f5f6c2bfd2644f077f (patch)
tree1d2aed8e92d7f96f51a65b3588c9344fb9419e89
parent7c230b07ca16ccca65f81fb73f6f4a21f2aafd38 (diff)
downloadrpmdrake-9711f0b5c5a1c4f36e7832f5f6c2bfd2644f077f.tar
rpmdrake-9711f0b5c5a1c4f36e7832f5f6c2bfd2644f077f.tar.gz
rpmdrake-9711f0b5c5a1c4f36e7832f5f6c2bfd2644f077f.tar.bz2
rpmdrake-9711f0b5c5a1c4f36e7832f5f6c2bfd2644f077f.tar.xz
rpmdrake-9711f0b5c5a1c4f36e7832f5f6c2bfd2644f077f.zip
offer to add an update media in MandrivaUpdate on startup if needed (#25708)
-rwxr-xr-xrpmdrake4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpmdrake b/rpmdrake
index d3f74479..e9f93265 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1433,7 +1433,7 @@ sub get_pkgs {
N("A fatal error occurred: %s.", $_[1]));
myexit(-1) if 0; #FIXME
};
- if (0) { # TODO/FIXME: renew me (w/o exit on fatal error)
+ if (member($default_list_mode, qw(all_updates security bugfix normal))) {
unless ($options{'no-media-update'}) {
if (@update_medias > 0) {
if (!$opts->{skip_updating_mu}) {
@@ -1457,7 +1457,7 @@ Then, restart %s.", $rpmdrake::myname_update));
myexit(-1);
}
mu_retry_another_mirror:
- my $mirror = choose_mirror(if_(exists $w->{real_window}, transient => $w->{real_window}));
+ my ($mirror) = choose_mirror(if_(exists $w->{real_window}, transient => $w->{real_window}));
my $m = ref($mirror) ? $mirror->{url} : '';
$m or interactive_msg_(N("How to choose manually your mirror"),
N("You may also choose your desired mirror manually: to do so,