summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-11-22 20:35:31 +0000
committerThierry Vignaud <tv@mageia.org>2011-11-22 20:35:31 +0000
commitcd71499f813307ac158e580f78176fefc069517a (patch)
tree707196fd1b3fb9879480cd8164c88fb999313621
parent270ea42ae6d6b28d90c97ad3f5b735c50e8b107f (diff)
downloaddrakx-cd71499f813307ac158e580f78176fefc069517a.tar
drakx-cd71499f813307ac158e580f78176fefc069517a.tar.gz
drakx-cd71499f813307ac158e580f78176fefc069517a.tar.bz2
drakx-cd71499f813307ac158e580f78176fefc069517a.tar.xz
drakx-cd71499f813307ac158e580f78176fefc069517a.zip
(bug_handler) remove top of traces that is inside bug handler from report
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/standalone.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 57ca3a00a..5b0c172d1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- drakbug:
o report the gtk+ theme in use (#3127) which explain some crashes (eg: #2679)
o include better C traces in reports
+ o remove top of traces that is inside bug handler from report
Version 13.6 - 10 November 2011
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index fdf659df9..7a9a8aa81 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -203,6 +203,7 @@ sub bug_handler {
# we want the full backtrace:
if ($is_signal) {
my $ctrace = c::C_backtrace();
+ $ctrace =~ s/0:.*(\d+:[^:]*Perl_sighandler)/\1/sig if $ctrace =~ /0:.*(\d+:[^:]*Perl_sighandler)/sig;
$error .= "\nGlibc's trace:\n$ctrace\n";
}
$error .= "Perl's trace:\n". common::backtrace() if $error;