|
Nikola Pajkovsky |
9e0d723 |
From e93f6cb75fe3ad7991deff0696538c93ee04cc7a Mon Sep 17 00:00:00 2001
|
|
Nikola Pajkovsky |
9e0d723 |
Message-Id: <e93f6cb75fe3ad7991deff0696538c93ee04cc7a.1324377641.git.npajkovs@redhat.com>
|
|
Nikola Pajkovsky |
9e0d723 |
From: Nikola Pajkovsky <npajkovs@redhat.com>
|
|
Nikola Pajkovsky |
9e0d723 |
Date: Mon, 19 Dec 2011 19:09:28 +0100
|
|
Nikola Pajkovsky |
9e0d723 |
Subject: [PATCH] rhbz#768647 - python doen't have a backtrace_rating file
|
|
Nikola Pajkovsky |
9e0d723 |
|
|
Nikola Pajkovsky |
9e0d723 |
Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
|
|
Nikola Pajkovsky |
9e0d723 |
---
|
|
Nikola Pajkovsky |
9e0d723 |
src/plugins/reporter-bugzilla.c | 10 ++++++++--
|
|
Nikola Pajkovsky |
9e0d723 |
src/plugins/rhbz.c | 2 +-
|
|
Nikola Pajkovsky |
9e0d723 |
2 files changed, 9 insertions(+), 3 deletions(-)
|
|
Nikola Pajkovsky |
9e0d723 |
|
|
Nikola Pajkovsky |
9e0d723 |
diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
|
|
Nikola Pajkovsky |
9e0d723 |
index d27e804..4dd9ec2 100644
|
|
Nikola Pajkovsky |
9e0d723 |
--- a/src/plugins/reporter-bugzilla.c
|
|
Nikola Pajkovsky |
9e0d723 |
+++ b/src/plugins/reporter-bugzilla.c
|
|
Nikola Pajkovsky |
9e0d723 |
@@ -392,7 +392,10 @@ int main(int argc, char **argv)
|
|
Nikola Pajkovsky |
9e0d723 |
|
|
Nikola Pajkovsky |
9e0d723 |
struct strbuf *full_desc = strbuf_new();
|
|
Nikola Pajkovsky |
9e0d723 |
strbuf_append_strf(full_desc, "%s\n\n", comment);
|
|
Nikola Pajkovsky |
9e0d723 |
- strbuf_append_strf(full_desc, "rating: %s\n", rating_str);
|
|
Nikola Pajkovsky |
9e0d723 |
+
|
|
Nikola Pajkovsky |
9e0d723 |
+ /* python doesn't have rating file */
|
|
Nikola Pajkovsky |
9e0d723 |
+ if (rating_str)
|
|
Nikola Pajkovsky |
9e0d723 |
+ strbuf_append_strf(full_desc, "%s: %s\n", FILENAME_RATING, rating_str);
|
|
Nikola Pajkovsky |
9e0d723 |
strbuf_append_strf(full_desc, "Package: %s\n", package);
|
|
Nikola Pajkovsky |
9e0d723 |
/* attach the architecture only if it's different from the initial report */
|
|
Nikola Pajkovsky |
9e0d723 |
if ((strcmp(bz->bi_platform, "All") != 0) &&
|
|
Nikola Pajkovsky |
9e0d723 |
@@ -423,7 +426,10 @@ int main(int argc, char **argv)
|
|
Nikola Pajkovsky |
9e0d723 |
}
|
|
Nikola Pajkovsky |
9e0d723 |
strbuf_free(full_desc);
|
|
Nikola Pajkovsky |
9e0d723 |
|
|
Nikola Pajkovsky |
9e0d723 |
- unsigned rating = xatou(rating_str);
|
|
Nikola Pajkovsky |
9e0d723 |
+ unsigned rating = 0;
|
|
Nikola Pajkovsky |
9e0d723 |
+ /* python doesn't have rating file */
|
|
Nikola Pajkovsky |
9e0d723 |
+ if (rating_str)
|
|
Nikola Pajkovsky |
9e0d723 |
+ rating = xatou(rating_str);
|
|
Nikola Pajkovsky |
9e0d723 |
if (!allow_comment && (bz->bi_best_bt_rating < rating))
|
|
Nikola Pajkovsky |
9e0d723 |
{
|
|
Nikola Pajkovsky |
9e0d723 |
char bug_id_str[sizeof(int)*3 + 2];
|
|
Nikola Pajkovsky |
9e0d723 |
diff --git a/src/plugins/rhbz.c b/src/plugins/rhbz.c
|
|
Nikola Pajkovsky |
9e0d723 |
index 704b5dc..592fbae 100644
|
|
Nikola Pajkovsky |
9e0d723 |
--- a/src/plugins/rhbz.c
|
|
Nikola Pajkovsky |
9e0d723 |
+++ b/src/plugins/rhbz.c
|
|
Nikola Pajkovsky |
9e0d723 |
@@ -115,7 +115,7 @@ static unsigned find_best_bt_rating_in_comments(GList *comments)
|
|
Nikola Pajkovsky |
9e0d723 |
{
|
|
Nikola Pajkovsky |
9e0d723 |
char *comment_body = (char *) l->data;
|
|
Nikola Pajkovsky |
9e0d723 |
|
|
Nikola Pajkovsky |
9e0d723 |
- char *start_rating_line = strstr(comment_body, "rating: ");
|
|
Nikola Pajkovsky |
9e0d723 |
+ char *start_rating_line = strstr(comment_body, FILENAME_RATING": ");
|
|
Nikola Pajkovsky |
9e0d723 |
if (!start_rating_line)
|
|
Nikola Pajkovsky |
9e0d723 |
{
|
|
Nikola Pajkovsky |
9e0d723 |
VERB3 error_msg("comment does not contain rating");
|
|
Nikola Pajkovsky |
9e0d723 |
--
|
|
Nikola Pajkovsky |
9e0d723 |
1.7.8
|
|
Nikola Pajkovsky |
9e0d723 |
|