summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2023-03-18 12:18:52 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2023-03-18 12:18:52 +0000
commit9c880641e066fedceaf0048df9dd894769f10733 (patch)
tree9ef48ba0b7b9a650e1855ce5aedbc56bc95ad9e1
parenta9a085fc70d8b42ede2f9674fd64b8fb233293c3 (diff)
downloaddrakx-9c880641e066fedceaf0048df9dd894769f10733.tar
drakx-9c880641e066fedceaf0048df9dd894769f10733.tar.gz
drakx-9c880641e066fedceaf0048df9dd894769f10733.tar.bz2
drakx-9c880641e066fedceaf0048df9dd894769f10733.tar.xz
drakx-9c880641e066fedceaf0048df9dd894769f10733.zip
Use OK/Cancel as button names when asking whether to retry after failing to add on-line media.
Next and Previous are logically inconsistent with retrying or aborting.
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 78f46304b..31a160aea 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- Use OK/Cancel as button names when asking whether to retry
+ after failing to add on-line media
- Recognize new kernel 6.0 drivers
Version 18.56 - 9 February 2023
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 1996efac0..4dc48acef 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -763,6 +763,7 @@ Do you want to setup the update media?")),
if (!any::urpmi_set_downloader($o, $o->{packages}, $urpmi_options->{downloader})) {
log::l("installUpdates: failed to change urpmi downloader");
+ local $::isWizard = 0; # make button names "ok" and "cancel", not "next" and "previous"
if ($o->ask_okcancel(N("Warning"),
N("That downloader could not be installed") . "\n" . N("Retry?"))) {
goto try_again;
@@ -780,6 +781,7 @@ Do you want to setup the update media?")),
log::l("installUpdates: successfully added media");
} else {
log::l("installUpdates: failed to add media");
+ local $::isWizard = 0; # make button names "ok" and "cancel", not "next" and "previous"
if ($o->ask_okcancel(N("Warning"),
N("Failure when adding medium") . "\n" . N("Retry?"))) {
goto try_again;