summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-02 06:18:05 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-02 06:18:05 +0000
commit85130b92ccd6a286f5c23bcd4fc90ea29b3b3649 (patch)
treea29a4afa917946c333cfb5b6d11b77b25b174977
parentd7a404163ee60002025bdb6c6635e7f9f49c1dde (diff)
downloaddrakx-85130b92ccd6a286f5c23bcd4fc90ea29b3b3649.tar
drakx-85130b92ccd6a286f5c23bcd4fc90ea29b3b3649.tar.gz
drakx-85130b92ccd6a286f5c23bcd4fc90ea29b3b3649.tar.bz2
drakx-85130b92ccd6a286f5c23bcd4fc90ea29b3b3649.tar.xz
drakx-85130b92ccd6a286f5c23bcd4fc90ea29b3b3649.zip
(bug_handler) prevent looping if drakbug crashes
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/standalone.pm4
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2a888756c..7267f88e8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- drakbug:
o do not fire on exceptions in eval { }
+ o do not loop if drakbug crashes
o put full backtrace on bugzilla, not only last call point
Version 10.4.152 - 01 August 2007, by Thierry Vignaud
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 32255665e..721a22bd0 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -189,6 +189,10 @@ sub bug_handler {
return if $error && $^S;
$error .= common::backtrace() if $error;
my $progname = $0;
+ if ($progname =~ /drakbug/) {
+ warn $error;
+ exit(1);
+ }
$progname =~ s|.*/||;
exec('drakbug', if_($error, '--error', $error), '--incident', $progname,);
}