diff options
-rw-r--r-- | src/include/abrtlib.h | 2 | ||||
-rw-r--r-- | src/lib/make_descr.c | 25 | ||||
-rw-r--r-- | src/plugins/abrt-action-bugzilla.c | 28 |
3 files changed, 13 insertions, 42 deletions
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h index 5d03ee49..1e68a661 100644 --- a/src/include/abrtlib.h +++ b/src/include/abrtlib.h @@ -251,8 +251,6 @@ enum { char *make_description(problem_data_t *problem_data, char **names_to_skip, unsigned max_text_size, unsigned desc_flags); #define make_description_bz abrt_make_description_bz char* make_description_bz(problem_data_t *problem_data); -#define make_description_comment abrt_make_description_comment -char* make_description_comment(problem_data_t *problem_data); #define make_description_logger abrt_make_description_logger char* make_description_logger(problem_data_t *problem_data); #define make_description_mailx abrt_make_description_mailx diff --git a/src/lib/make_descr.c b/src/lib/make_descr.c index 036d7770..d0afc8cb 100644 --- a/src/lib/make_descr.c +++ b/src/lib/make_descr.c @@ -260,28 +260,3 @@ char* make_description_logger(problem_data_t *problem_data) MAKEDESC_SHOW_FILES | MAKEDESC_SHOW_MULTILINE ); } - -char* make_description_comment(problem_data_t *problem_data) -{ - char *comment = NULL; - struct problem_item *value; - - value = get_problem_data_item_or_NULL(problem_data, FILENAME_COMMENT); - if (value) - { - if (value->content[0]) - comment = xasprintf("\n\nComment\n-----\n%s", value->content); - } - - if (!comment) - return NULL; - - struct strbuf *buf_dsc = strbuf_new(); - - if (comment) - strbuf_append_str(buf_dsc, comment); - - free(comment); - - return strbuf_free_nobuf(buf_dsc); -} diff --git a/src/plugins/abrt-action-bugzilla.c b/src/plugins/abrt-action-bugzilla.c index d617d4bb..9290112a 100644 --- a/src/plugins/abrt-action-bugzilla.c +++ b/src/plugins/abrt-action-bugzilla.c @@ -170,26 +170,24 @@ static void report_to_bugzilla(const char *dump_dir_name, map_string_h *settings rhbz_mail_to_cc(client, bz->bi_id, login, RHBZ_NOMAIL_NOTIFY); } - char *dsc = make_description_comment(problem_data); - if (dsc) + const char *comment = get_problem_item_content_or_NULL(problem_data, FILENAME_COMMENT); + if (comment && comment[0]) { - const char *package = get_problem_item_content_or_NULL(problem_data, - FILENAME_PACKAGE); - const char *release = get_problem_item_content_or_NULL(problem_data, - FILENAME_OS_RELEASE); - if (!release) /* Old dump dir format compat. Remove in abrt-2.1 */ - release = get_problem_item_content_or_NULL(problem_data, "release"); - const char *arch = get_problem_item_content_or_NULL(problem_data, - FILENAME_ARCHITECTURE); - + const char *package = get_problem_item_content_or_NULL(problem_data, FILENAME_PACKAGE); + const char *release = get_problem_item_content_or_NULL(problem_data, FILENAME_OS_RELEASE); +//COMPAT, remove in abrt-2.1 release + if (!release)release= get_problem_item_content_or_NULL(problem_data, "release"); + const char *arch = get_problem_item_content_or_NULL(problem_data, FILENAME_ARCHITECTURE); char *full_dsc = xasprintf("Package: %s\n" "Architecture: %s\n" "OS Release: %s\n" - "%s", package, arch, release, dsc); - + "\n" + "Comment\n" + "-----\n" + "%s\n", + package, arch, release, comment + ); log(_("Adding new comment to bug %d"), bz->bi_id); - free(dsc); - /* unused code, enable it when gui/cli will be ready int is_priv = is_private && string_to_bool(is_private); const char *is_private = get_problem_item_content_or_NULL(problem_data, |