rpms/libreport
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix an another bug preventing report-gtk to report to bugzilla

Browse Source 
- Resolves: #801255, #846389
This commit is contained in:
Jakub Filak 2012-08-14 14:46:27 +02:00
parent 4f72cee7c8
commit 24c661d6a8
7 changed files with 79284 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78929
0011-updated-po-files.patch Normal file
View File

File diff suppressed because it is too large Load Diff

25
0012-added-internal_libreport.h-into-POTFILES.in-rhbz-801.patch Normal file
View File

@ -0,0 +1,25 @@
From e2b7b7ed494e8b822aba0617d1a555a51ebdf76c Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Mon, 13 Aug 2012 13:56:06 +0200
Subject: [LIBREPORT PATCH 12/16] added internal_libreport.h into POTFILES.in
rhbz#801255
---
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c991817..668c526 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,6 +10,7 @@ src/gtk-helpers/secrets.c
src/gui-wizard-gtk/main.c
src/gui-wizard-gtk/wizard.c
src/gui-wizard-gtk/wizard.glade
+src/include/internal_libreport.h
src/lib/abrt_sock.c
src/lib/create_dump_dir.c
src/lib/event_config.c
--
1.7.11.2

34
0013-report-gtk-don-t-log-THANKYOU-message.patch Normal file
View File

@ -0,0 +1,34 @@
From 5f91ab6a3db9159596839956eb9c396a87977574 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Mon, 13 Aug 2012 17:11:58 +0200
Subject: [LIBREPORT PATCH 13/16] report-gtk: don't log THANKYOU message
Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
src/gui-wizard-gtk/wizard.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
index 5d399f4..16728b6 100644
--- a/src/gui-wizard-gtk/wizard.c
+++ b/src/gui-wizard-gtk/wizard.c
@@ -1320,7 +1320,6 @@ static void run_event_gtk_error(const char *error_line, void *param)
static char *run_event_gtk_logging(char *log_line, void *param)
{
struct analyze_event_data *evd = (struct analyze_event_data *)param;
- update_command_run_log(log_line, evd);
if (strcmp(log_line, "THANKYOU") == 0)
{
@@ -1329,6 +1328,8 @@ static char *run_event_gtk_logging(char *log_line, void *param)
if (!g_expert_mode)
evd->success_msg = _("Processing finished.");
}
+ else
+ update_command_run_log(log_line, evd);
return log_line;
}
--
1.7.11.2

67
0014-trac-556-skip-not-provided-bz-bug-description-templa.patch Normal file
View File

@ -0,0 +1,67 @@
From a71786ab92bdc45f5eae09ffe9d2839e86f5be11 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Thu, 9 Aug 2012 17:52:00 +0200
Subject: [LIBREPORT PATCH 14/16] trac#556: skip not provided bz bug
description template fields
Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
src/plugins/rhbz.c | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/plugins/rhbz.c b/src/plugins/rhbz.c
index ea8c09d..3bdf139 100644
--- a/src/plugins/rhbz.c
+++ b/src/plugins/rhbz.c
@@ -659,29 +659,32 @@ int rhbz_new_bug(struct abrt_xmlrpc *ax, problem_data_t *problem_data,
}
else
{
+ /* Generating of a description according to the RH bugzilla default format:
+ * https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora
+ */
+ struct strbuf *tmp_full_dsc = strbuf_new();
+
const char *comment = problem_data_get_content_or_NULL(problem_data,
FILENAME_COMMENT);
+ if (comment)
+ strbuf_append_strf(tmp_full_dsc, "Description of problem:\n%s\n\n", comment);
+
+ if (package)
+ strbuf_append_strf(tmp_full_dsc, "Version-Release number of selected component:\n%s\n\n", package);
char *bz_dsc = make_description(problem_data, (char**)g_additional_info_files,
- CD_TEXT_ATT_SIZE_BZ, MAKEDESC_SHOW_MULTILINE | MAKEDESC_WHITELIST);
+ CD_TEXT_ATT_SIZE_BZ, MAKEDESC_SHOW_MULTILINE | MAKEDESC_WHITELIST);
+ strbuf_append_strf(tmp_full_dsc, "Additional info:\nlibreport version: "VERSION"\n%s\n", bz_dsc);
+ free(bz_dsc);
char *backtrace = rhbz_get_backtrace_info(problem_data, CD_TEXT_ATT_SIZE_BZ);
+ if (backtrace)
+ {
+ strbuf_append_str(tmp_full_dsc, backtrace);
+ free(backtrace);
+ }
- /* Generating of a description according to the RH bugzilla default format:
- * https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora
- */
- full_dsc = xasprintf("Description of problem:\n%s\n\n"
- "Version-Release number of selected component:\n%s\n\n"
- "Additional info:\n"
- "libreport version: "VERSION"\n%s\n"
- "%s",
- comment ? comment : "",
- package,
- bz_dsc,
- backtrace ? backtrace : "");
-
- free(backtrace);
- free(bz_dsc);
+ full_dsc = strbuf_free_nobuf(tmp_full_dsc);
}
char *product = NULL;
--
1.7.11.2

181
0015-rhbz-846389-generate-koops-description-according-to-.patch Normal file
View File

@ -0,0 +1,181 @@
From 51efa4446d8cf30c88d0b31a9b26a9223fecdaee Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Thu, 9 Aug 2012 18:37:40 +0200
Subject: [LIBREPORT PATCH 15/16] rhbz#846389: generate koops description
according to rhbz std template
New kernel bug reports is to be created according the following
template:
<if comment exists:>
Description of problem:
<$user's comment>
<fi>
Additional info:
libreport version: <$libreport version>
abrt_version: <$abrt version>
cmdline: <$cmdline>
kernel: <$kernel version>
tainted_long: <$tainted long if present>
backtrace:
<$stack trace>
No files attacheced.
Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
src/include/internal_libreport.h | 2 --
src/lib/make_descr.c | 19 ------------
src/plugins/rhbz.c | 66 ++++++++++++++++++----------------------
3 files changed, 29 insertions(+), 58 deletions(-)
diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h
index e0cd7e6..db22ae1 100644
--- a/src/include/internal_libreport.h
+++ b/src/include/internal_libreport.h
@@ -587,8 +587,6 @@ char *make_description_item_multiline(const char *name, const char* content);
char* make_description_bz(problem_data_t *problem_data, unsigned max_text_size);
#define make_description_logger libreport_make_description_logger
char* make_description_logger(problem_data_t *problem_data, unsigned max_text_size);
-#define make_description_koops libreport_make_description_koops
-char* make_description_koops(problem_data_t *problem_data, unsigned max_text_size);
//UNUSED
//#define make_description_mailx libreport_make_description_mailx
//char* make_description_mailx(problem_data_t *problem_data);
diff --git a/src/lib/make_descr.c b/src/lib/make_descr.c
index c8c0f71..0b4cdb5 100644
--- a/src/lib/make_descr.c
+++ b/src/lib/make_descr.c
@@ -298,22 +298,3 @@ char* make_description_logger(problem_data_t *problem_data, unsigned max_text_si
MAKEDESC_SHOW_FILES | MAKEDESC_SHOW_MULTILINE
);
}
-
-/* Items we want to include to bz */
-static const char *const whitelisted_items[] = {
- FILENAME_CMDLINE,
- FILENAME_BACKTRACE,
- NULL
-};
-
-char* make_description_koops(problem_data_t *problem_data, unsigned max_text_size)
-{
- return make_description(
- problem_data,
- (char**)whitelisted_items,
- max_text_size,
- MAKEDESC_SHOW_FILES
- | MAKEDESC_SHOW_MULTILINE
- | MAKEDESC_WHITELIST
- );
-}
diff --git a/src/plugins/rhbz.c b/src/plugins/rhbz.c
index 3bdf139..9c9ea34 100644
--- a/src/plugins/rhbz.c
+++ b/src/plugins/rhbz.c
@@ -624,15 +624,20 @@ int rhbz_new_bug(struct abrt_xmlrpc *ax, problem_data_t *problem_data,
FILENAME_ANALYZER);
const char *tainted_short = problem_data_get_content_or_NULL(problem_data,
FILENAME_TAINTED_SHORT);
+ const char *comment = problem_data_get_content_or_NULL(problem_data,
+ FILENAME_COMMENT);
struct strbuf *buf_summary = strbuf_new();
+
+ const bool kerneloops = analyzer && strcmp(analyzer, "Kerneloops") == 0;
+
if (analyzer && strcmp(analyzer, "libreport") == 0)
{
strbuf_append_str(buf_summary, reason);
}
else
{
- if (analyzer && strcmp(analyzer, "Kerneloops") == 0)
+ if (kerneloops)
strbuf_append_str(buf_summary, "[abrt]");
else
strbuf_append_strf(buf_summary, "[abrt] %s", package);
@@ -644,48 +649,34 @@ int rhbz_new_bug(struct abrt_xmlrpc *ax, problem_data_t *problem_data,
strbuf_append_strf(buf_summary, ": %s", reason);
if (tainted_short)
- {
strbuf_append_strf(buf_summary, ": TAINTED %s", tainted_short);
- }
}
- char *status_whiteboard = xasprintf("abrt_hash:%s", duphash);
- char *full_dsc = NULL;
- if (analyzer && strcmp(analyzer, "Kerneloops") == 0)
+ /* Generating of a description according to the RH bugzilla default format:
+ * https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora
+ */
+ struct strbuf *tmp_full_dsc = strbuf_new();
+ if (comment)
+ strbuf_append_strf(tmp_full_dsc, "Description of problem:\n%s\n\n", comment);
+
+ /* the package file always contains 'kernel' string in case of kerneloops */
+ /* it doesn't make sense to mess up a description with this useless information */
+ if (package && !kerneloops)
+ strbuf_append_strf(tmp_full_dsc, "Version-Release number of selected component:\n%s\n\n", package);
+
+ char *bz_dsc = make_description(problem_data, (char**)g_additional_info_files,
+ CD_TEXT_ATT_SIZE_BZ, MAKEDESC_SHOW_MULTILINE | MAKEDESC_WHITELIST);
+ strbuf_append_strf(tmp_full_dsc, "Additional info:\nlibreport version: "VERSION"\n%s\n", bz_dsc);
+ free(bz_dsc);
+
+ char *backtrace = rhbz_get_backtrace_info(problem_data, CD_TEXT_ATT_SIZE_BZ);
+ if (backtrace)
{
- char *bz_dsc = make_description_koops(problem_data, CD_TEXT_ATT_SIZE_BZ);
- full_dsc = xasprintf("libreport version: "VERSION"\n%s", bz_dsc);
- free(bz_dsc);
+ strbuf_append_str(tmp_full_dsc, backtrace);
+ free(backtrace);
}
- else
- {
- /* Generating of a description according to the RH bugzilla default format:
- * https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora
- */
- struct strbuf *tmp_full_dsc = strbuf_new();
- const char *comment = problem_data_get_content_or_NULL(problem_data,
- FILENAME_COMMENT);
- if (comment)
- strbuf_append_strf(tmp_full_dsc, "Description of problem:\n%s\n\n", comment);
-
- if (package)
- strbuf_append_strf(tmp_full_dsc, "Version-Release number of selected component:\n%s\n\n", package);
-
- char *bz_dsc = make_description(problem_data, (char**)g_additional_info_files,
- CD_TEXT_ATT_SIZE_BZ, MAKEDESC_SHOW_MULTILINE | MAKEDESC_WHITELIST);
- strbuf_append_strf(tmp_full_dsc, "Additional info:\nlibreport version: "VERSION"\n%s\n", bz_dsc);
- free(bz_dsc);
-
- char *backtrace = rhbz_get_backtrace_info(problem_data, CD_TEXT_ATT_SIZE_BZ);
- if (backtrace)
- {
- strbuf_append_str(tmp_full_dsc, backtrace);
- free(backtrace);
- }
-
- full_dsc = strbuf_free_nobuf(tmp_full_dsc);
- }
+ char *full_dsc = strbuf_free_nobuf(tmp_full_dsc);
char *product = NULL;
char *version = NULL;
@@ -693,6 +684,7 @@ int rhbz_new_bug(struct abrt_xmlrpc *ax, problem_data_t *problem_data,
xmlrpc_value* result = NULL;
char *summary = strbuf_free_nobuf(buf_summary);
+ char *status_whiteboard = xasprintf("abrt_hash:%s", duphash);
if (!group)
{
--
1.7.11.2

27
0016-report-gtk-bug-fix-compare-ask-yes-no-dialog-respons.patch Normal file
View File

@ -0,0 +1,27 @@
From 2b2c672b89d6c44a4c63d412f19631323d099490 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Tue, 14 Aug 2012 11:27:16 +0200
Subject: [LIBREPORT PATCH 16/16] report-gtk: bug fix, compare ask yes/no
dialog response to correct constant
Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
src/gui-wizard-gtk/wizard.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
index 16728b6..a4b3961 100644
--- a/src/gui-wizard-gtk/wizard.c
+++ b/src/gui-wizard-gtk/wizard.c
@@ -351,7 +351,7 @@ static bool ask_yes_no_save_result(const char *message, const char *option_name)
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
- return response == GTK_RESPONSE_OK;
+ return response == GTK_RESPONSE_YES;
}
static bool ask_continue_before_steal(const char *base_dir, const char *dump_dir)
--
1.7.11.2

22
libreport.spec
View File

@ -5,7 +5,7 @@
Summary: Generic library for reporting various problems
Name: libreport
Version: 2.0.12
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: https://fedorahosted.org/abrt/
@ -20,6 +20,12 @@ Patch7: 0007-trac-660-report-gtk-asks-for-permission-to-send-sens.patch
Patch8: 0008-trac-660-report-cli-asks-for-premission-to-send-sens.patch
Patch9: 0009-trac-623-dd_opendir-fails-if-time-file-doesn-t-conta.patch
Patch10: 0010-wizard-small-changes-to-message-texts-and-one-functi.patch
Patch11: 0011-updated-po-files.patch
Patch12: 0012-added-internal_libreport.h-into-POTFILES.in-rhbz-801.patch
Patch13: 0013-report-gtk-don-t-log-THANKYOU-message.patch
Patch14: 0014-trac-556-skip-not-provided-bz-bug-description-templa.patch
Patch15: 0015-rhbz-846389-generate-koops-description-according-to-.patch
Patch16: 0016-report-gtk-bug-fix-compare-ask-yes-no-dialog-respons.patch
BuildRequires: dbus-devel
BuildRequires: gtk3-devel
BuildRequires: curl-devel
@ -245,6 +251,12 @@ Plugin to report bugs into anonymous FTP site associated with ticketing system.
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%build
autoconf
@ -417,6 +429,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf
%changelog
* Tue Aug 14 2012 Jakub Filak <jfilak@redhat.com> 2.0.12-4
- rhbz#846389: generate koops description according to rhbz std template
- trac#556: skip not provided bz bug description template fields
- report-gtk: don't log THANKYOU message
- added internal_libreport.h into POTFILES.in rhbz#801255
- updated po files
- Resolves: #801255, #846389
* Fri Aug 10 2012 Jakub Filak <jfilak@redhat.com> 2.0.12-3
- wizard: small changes to message texts and one function name
- trac#623: dd_opendir() fails if time file doesn't contain valid time stamp