diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-03-06 20:33:08 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-03-06 20:33:08 +0000 |
commit | b8bbce1c9ffa929af0f56179527b45a8c0da62a7 (patch) | |
tree | 321d9e5168c682f1e8d08e7d2f500ce0ba1d4ec4 | |
parent | 93835180bc5fc2aefdac45778f2ccab3084b91dc (diff) | |
download | drakx-b8bbce1c9ffa929af0f56179527b45a8c0da62a7.tar drakx-b8bbce1c9ffa929af0f56179527b45a8c0da62a7.tar.gz drakx-b8bbce1c9ffa929af0f56179527b45a8c0da62a7.tar.bz2 drakx-b8bbce1c9ffa929af0f56179527b45a8c0da62a7.tar.xz drakx-b8bbce1c9ffa929af0f56179527b45a8c0da62a7.zip |
(SEGV handler) fix double segfault when text installer fails to init
-rw-r--r-- | perl-install/install/NEWS | 1 | ||||
-rw-r--r-- | perl-install/install/install2.pm | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b88ac04d8..f6068abb4 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- fix double segfault when text installer fails to init - fix stopping udev Version 13.89 - 02 March 2012 diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm index bf4a294d1..4fdba1f57 100644 --- a/perl-install/install/install2.pm +++ b/perl-install/install/install2.pm @@ -26,6 +26,7 @@ use any; use log; use fs; use fs::any; +use Scalar::Util qw(blessed dualvar); #-####################################################################################### @@ -320,7 +321,7 @@ sub main { $SIG{SEGV} = sub { my $msg = "segmentation fault: install crashed (maybe memory is missing?)\n" . backtrace(); log::l("$msg\n"); - $o and $o->ask_warn('', $msg); + blessed($o) and $o->ask_warn('', $msg); setVirtual(1); require install::steps_auto_install; install::steps_auto_install_non_interactive::errorInStep($o, $msg); |