diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-09 03:34:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-09 03:34:27 +0000 |
| commit | e7e3543708edb4a12e0bc744c06420344522eea4 (patch) | |
| tree | 2b8f633c767cfc38f83619a32d506fff6db80e9d | |
| parent | 01988a82b1ebfa676cc48c277156954d4f568507 (diff) | |
| download | drakx-e7e3543708edb4a12e0bc744c06420344522eea4.tar drakx-e7e3543708edb4a12e0bc744c06420344522eea4.tar.gz drakx-e7e3543708edb4a12e0bc744c06420344522eea4.tar.bz2 drakx-e7e3543708edb4a12e0bc744c06420344522eea4.tar.xz drakx-e7e3543708edb4a12e0bc744c06420344522eea4.zip | |
correctly call errorInStep()
| -rw-r--r-- | perl-install/install2.pm | 7 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_steps_auto_install.pm | 9 |
3 files changed, 10 insertions, 9 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index d7e6c4977..2d6be8961 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -337,11 +337,11 @@ sub start_i810fb() { #-###################################################################################### sub main { $SIG{SEGV} = sub { - my $msg = "segmentation fault: seems like memory is missing as the install crashes"; print "$msg\n"; log::l($msg); + my $msg = "segmentation fault: seems like memory is missing as the install crashes"; log::l($msg); $o->ask_warn('', $msg); setVirtual(1); require install_steps_auto_install; - install_steps_auto_install_non_interactive::errorInStep(); + install_steps_auto_install_non_interactive::errorInStep($o, $msg); }; $ENV{PERL_BADLANG} = 1; $ENV{LD_ASSUME_KERNEL} = '2.4.1'; @@ -493,8 +493,7 @@ sub main { log::l("error using auto_install, continuing"); undef $::auto_install; } else { - print "Error using auto_install\n", formatError($@), "\n"; - install_steps_auto_install_non_interactive::errorInStep(); + install_steps_auto_install_non_interactive::errorInStep($o, "Error using auto_install\n" . formatError($@)); } } else { log::l("auto install config file loaded successfully"); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index c07613a9d..f0d540d7e 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -86,8 +86,9 @@ Continue at your own risk."), formatError($@) ]) if $@; } sub errorInStep { - my ($_o, $_err) = @_; + my ($_o, $err) = @_; print "error :(\n"; + print "$err\n\n"; c::_exit(1); } sub kill_action {} diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm index 2ef2e4632..4f90d7c69 100644 --- a/perl-install/install_steps_auto_install.pm +++ b/perl-install/install_steps_auto_install.pm @@ -80,10 +80,11 @@ sub enteringStep { } sub rebootNeeded { - my ($_o) = @_; - print "\nWhile partitioning, the partition table re-read failed, needing a reboot\n"; - print "This is plain wrong for an auto_install\n"; - errorInStep(); + my ($o) = @_; + errorInStep($o, <<EOF); +While partitioning, the partition table re-read failed, needing a reboot +This is plain wrong for an auto_install +EOF } sub ask_warn { |