summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-08 18:06:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-08 18:06:00 +0000
commitc546d79301231b3419522071b5cd479651058729 (patch)
treecbc211873b5eb8c93fcd332cc4cda1585aae7195
parent50ff4c3265bbce6a78a01773143ab7554997661c (diff)
downloaddrakx-backup-do-not-use-c546d79301231b3419522071b5cd479651058729.tar
drakx-backup-do-not-use-c546d79301231b3419522071b5cd479651058729.tar.gz
drakx-backup-do-not-use-c546d79301231b3419522071b5cd479651058729.tar.bz2
drakx-backup-do-not-use-c546d79301231b3419522071b5cd479651058729.tar.xz
drakx-backup-do-not-use-c546d79301231b3419522071b5cd479651058729.zip
display the error
-rw-r--r--perl-install/install2.pm1
-rw-r--r--perl-install/install_steps_auto_install.pm3
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 0525ee8a2..5385ead46 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -611,6 +611,7 @@ sub main {
local $_ = $err;
$o->kill_action;
if (!/^already displayed/) {
+ log::l("error: $err");
eval { $o->errorInStep($_) };
$o->{steps}{$o->{step}}{auto} = 0;
$err = $@;
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 2c89ffbad..465ac10c9 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -100,8 +100,9 @@ sub charsetChanged {
}
sub errorInStep {
- my ($_o, $_err) = @_;
+ my ($_o, $err) = @_;
print "error :(\n";
+ print "$err\n\n";
print "switch to console f2 for a shell\n";
print "Press <Enter> to reboot\n";
<STDIN>;