summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-23 17:19:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-23 17:19:26 +0000
commita1cd54dd7250397b4c8dee3795bac575a82853ab (patch)
tree9fa5a68d720dc687104e08040d11a6902f62bf35 /perl-install/install_steps_interactive.pm
parenta2658d55bf1a3c887ae624fdb6a35ec81ee94ccd (diff)
downloaddrakx-a1cd54dd7250397b4c8dee3795bac575a82853ab.tar
drakx-a1cd54dd7250397b4c8dee3795bac575a82853ab.tar.gz
drakx-a1cd54dd7250397b4c8dee3795bac575a82853ab.tar.bz2
drakx-a1cd54dd7250397b4c8dee3795bac575a82853ab.tar.xz
drakx-a1cd54dd7250397b4c8dee3795bac575a82853ab.zip
(exitInstall): no "cancel" button
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d5bb65dec..e7f4e6e09 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -34,8 +34,7 @@ use log;
#-######################################################################################
sub errorInStep($$) {
my ($o, $err) = @_;
- $err =~ s/ at .*?$/\./ unless $::testing; #- avoid error message.
- $o->ask_warn(_("Error"), [ _("An error occurred"), $err ]);
+ $o->ask_warn(_("Error"), [ _("An error occurred"), common::formatError($err) ]);
}
sub kill_action {
@@ -1129,8 +1128,9 @@ For information on fixes which are available for this release of Linux-Mandrake,
consult the Errata available from http://www.linux-mandrake.com/.
Information on configuring your system is available in the post
-install chapter of the Official Linux-Mandrake User's Guide.")
- },
+install chapter of the Official Linux-Mandrake User's Guide."),
+ cancel => '',
+ },
[
if_($::expert,
{ val => \ (my $t1 = _("Generate auto install floppy")), clicked => sub {