From 51a3918434aec04d057bf5a0d117214c9e6d9413 Mon Sep 17 00:00:00 2001
From: Nikola Pajkovsky <npajkovs@redhat.com>
Date: Wed, 30 Nov 2011 19:57:58 +0100
Subject: [PATCH 4/6] reorganize comments for bugzilla -- message body comes
 first

Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
---
 src/plugins/reporter-bugzilla.c |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
index b6356f9..e150944 100644
--- a/src/plugins/reporter-bugzilla.c
+++ b/src/plugins/reporter-bugzilla.c
@@ -389,24 +389,22 @@ int main(int argc, char **argv)
             const char *package = get_problem_item_content_or_NULL(problem_data, FILENAME_PACKAGE);
             const char *arch    = get_problem_item_content_or_NULL(problem_data, FILENAME_ARCHITECTURE);
             const char *rating_str = get_problem_item_content_or_NULL(problem_data, FILENAME_RATING);
-            char *full_dsc = xasprintf("Package: %s\n"
-                                       "Architecture: %s\n"
-                                       "OS Release: %s\n"
-                                       "rating: %s\n"
-                                       "\n"
-                                       "Comment\n"
-                                       "-----\n"
-                                       "%s\n",
-                                       package, arch, release, rating_str, comment
-            );
+
+            struct strbuf *full_desc = strbuf_new();
+            strbuf_append_strf(full_desc, "%s\n\n", comment);
+            strbuf_append_strf(full_desc, "rating: %s\n", rating_str);
+            strbuf_append_strf(full_desc, "Package: %s\n", package);
+            strbuf_append_strf(full_desc, "Architecture: %s\n", arch);
+            strbuf_append_strf(full_desc, "OS Release: %s\n", release);
+
             log(_("Adding new comment to bug %d"), bz->bi_id);
             /* 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,
                                                                       "is_private");
             */
-            rhbz_add_comment(client, bz->bi_id, full_dsc, 0);
-            free(full_dsc);
+            rhbz_add_comment(client, bz->bi_id, full_desc->buf, 0);
+            strbuf_free(full_desc);
 
             unsigned rating = xatou(rating_str);
             if (bz->bi_best_bt_rating < rating)
-- 
1.7.7.3