summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-30 21:33:14 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-30 21:33:14 +0000
commit4dffd3a6197bc3c3805b4669d7caf51e5a8a17b0 (patch)
tree384c3a0a21eaf46590b467f20d8349d7befd041e
parent07311ea1cb7d673cee7725a50dd9e3343ca3133f (diff)
downloaddrakx-4dffd3a6197bc3c3805b4669d7caf51e5a8a17b0.tar
drakx-4dffd3a6197bc3c3805b4669d7caf51e5a8a17b0.tar.gz
drakx-4dffd3a6197bc3c3805b4669d7caf51e5a8a17b0.tar.bz2
drakx-4dffd3a6197bc3c3805b4669d7caf51e5a8a17b0.tar.xz
drakx-4dffd3a6197bc3c3805b4669d7caf51e5a8a17b0.zip
(ask_change_cd_) make button name match text, aka being "cancel" rather than "previous"
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm1
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a8f8a5e85..5c9a73241 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- log (g|)urpmi.addmedia and (g|)urpmi output into
/root/drakx/updates.log (#47107)
+- make button name match text when inserting a CD ("cancel" rather
+ than "previous")
- rotate /root/drakx/install1.log too
Version 12.21 - 30 March 2009
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index d67a7a1c8..c6fb1108d 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -369,6 +369,7 @@ sub ask_change_cd {
sub ask_change_cd_ {
my ($o, $medium) = @_;
+ local $::isWizard = 0;
$o->ask_okcancel('', N("Change your Cd-Rom!
Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.
If you do not have it, press Cancel to avoid installation from this Cd-Rom.", $medium), 1) or return;