summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakbug10
2 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7267f88e8..b6803ece0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- drakbug:
+ o display the program that actually crashed and the error message
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
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index b8ba268f2..35e8edb36 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -95,7 +95,15 @@ $comb_app->set_text("");
gtkadd($window->{window},
gtkpack_(Gtk2::VBox->new(0, 5),
0, gtknew('Title1', label => $mandrake_release),
- 0, gtkset_justify(Gtk2::WrappedLabel->new(formatAlaTeX(N("To submit a bug report, click on the report button. \nThis will open a web browser window on %s where you'll find a form to fill in. The information displayed above will be transferred to that server. \nThings useful to include in your report are the output of lspci, kernel version, and /proc/cpuinfo.", $wizard_name))), "left"),
+ 0, gtkset_justify(Gtk2::WrappedLabel->new(
+ formatAlaTeX(
+ join("\n\n",
+ if_($prog, $error ?
+ N("The \"%s\" program has crashed with the following error:", $prog)
+ . join("\n\n", "\n", split("\n", $error), '')
+ : N("The \"%s\" program has crashed.", $prog)
+ ),
+ N("To submit a bug report, click on the report button. \nThis will open a web browser window on %s where you'll find a form to fill in. The information displayed above will be transferred to that server. \nThings useful to include in your report are the output of lspci, kernel version, and /proc/cpuinfo.", $wizard_name)))), "left"),
0, gtkadd($table),
0, gtkpack(Gtk2::HSeparator->new),
0, gtkpack(create_hbox('edge'),