summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-05-15 14:56:45 +0000
committerThierry Vignaud <tv@mandriva.org>2008-05-15 14:56:45 +0000
commit8ada9d2212c66e2920988cf8b91e16ab90bdd0d6 (patch)
treef2de1af17582537e3ebff8bac2101823c33353b8 /perl-install
parent864c2f00105057f694d84af17a4ec21ede85aee0 (diff)
downloaddrakx-8ada9d2212c66e2920988cf8b91e16ab90bdd0d6.tar
drakx-8ada9d2212c66e2920988cf8b91e16ab90bdd0d6.tar.gz
drakx-8ada9d2212c66e2920988cf8b91e16ab90bdd0d6.tar.bz2
drakx-8ada9d2212c66e2920988cf8b91e16ab90bdd0d6.tar.xz
drakx-8ada9d2212c66e2920988cf8b91e16ab90bdd0d6.zip
(report_bug_to_bugzilla) automatically report CPU name & kernel version
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakbug15
2 files changed, 13 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 997c24f7f..54982d43c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- drakbug:
+ o automatically report CPU name & kernel version
o prefill the platform field
Version 10.32 - 13 May 2008
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index 5b32631c2..14f37ff40 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -238,6 +238,10 @@ sub report_bug_to_bugzilla() {
}
my $rel_data = mandrake_release_info();
my $rel = standalone::real_version();
+ my $cpuinfo;
+ if (cat_('/proc/cpuinfo') =~ /model name\s*:\s*(.*)$/m) {
+ $cpuinfo = $1;
+ }
my $arch = arch();
$arch = 'i586' if arch =~ /^i.86/;
my $options = join('&',
@@ -248,7 +252,10 @@ sub report_bug_to_bugzilla() {
"rep_platform=$arch",
if_($incident,
"short_desc=$prog%20" . ($segfaulted ? 'segfaulted' : 'crashed'),
- 'comment=' . uri_escape(qq(The "$prog" program crashed. Drakbug-$rel caught it.
+ ),
+ 'comment=' . uri_escape(
+ if_($incident,
+ qq(The "$prog" program crashed. Drakbug-$rel caught it.
) . ($text || "Please describe what you were doing when it crashed.") . "\n\n"
. ($error ? qq(Backtrace was:
@@ -257,8 +264,10 @@ $error) :
. if_($gdb_trace, qq(
GDB backtrace was (its interesting part is below Perl_pp_fork() or Perl_pp_waitpid()):
$gdb_trace)),
- ),
- ),
+ )
+ . qq(Kernel version = $kernel_release
+) . if_($cpuinfo, "CPU=$cpuinfo")
+ ),
);
print($bugzilla_url . "?" . $options . "\n");
run_program::raw({ detach => 1, setuid => $parent_uid }, '/usr/bin/www-browser', "$bugzilla_url?$options");