1 |
commit 238967e6be90f5458a2ec596ef7d7c1b60b3b3e1 |
2 |
Author: dmorgan <dmorgan@localhost.(none)> |
3 |
Date: Sun Jun 19 16:28:41 2011 +0200 |
4 |
|
5 |
Adapt to mageia bugzilla |
6 |
|
7 |
diff --git a/src/plugins/Bugzilla.conf b/src/plugins/Bugzilla.conf |
8 |
index 76e0d1d..8253ac7 100644 |
9 |
--- a/src/plugins/Bugzilla.conf |
10 |
+++ b/src/plugins/Bugzilla.conf |
11 |
@@ -3,7 +3,7 @@ |
12 |
Enabled = yes |
13 |
|
14 |
# Bugzilla URL |
15 |
-BugzillaURL = https://bugzilla.redhat.com/ |
16 |
+BugzillaURL = https://bugs.mageia.org/ |
17 |
# yes means that ssl certificates will be checked |
18 |
SSLVerify = yes |
19 |
# your login has to exist, if you don have any, please create one |
20 |
diff --git a/src/plugins/abrt-Bugzilla.7 b/src/plugins/abrt-Bugzilla.7 |
21 |
index 708695c..443d42a 100644 |
22 |
--- a/src/plugins/abrt-Bugzilla.7 |
23 |
+++ b/src/plugins/abrt-Bugzilla.7 |
24 |
@@ -20,7 +20,7 @@ The \fIBugzilla.conf\fP configuration file contains several |
25 |
entries in the format "Option = Value". The options are: |
26 |
.SS BugzillaURL |
27 |
The URL of the Bugzilla instance that you want to use, including the |
28 |
-path to the xmlrpc. The default is https://bugzilla.redhat.com/xmlrpc.cgi |
29 |
+path to the xmlrpc. The default is https://bugs.mageia.org/xmlrpc.cgi |
30 |
.SS Login |
31 |
Your Bugzilla login. If you have no Bugzilla account, you cannot |
32 |
use the plugin. |
33 |
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp |
34 |
index e8a605f..4898e74 100644 |
35 |
--- a/src/plugins/abrt-action-bugzilla.cpp |
36 |
+++ b/src/plugins/abrt-action-bugzilla.cpp |
37 |
@@ -303,13 +303,13 @@ xmlrpc_value* ctx::call_quicksearch_duphash(const char* component, |
38 |
{ |
39 |
char *query = NULL; |
40 |
if (!release) |
41 |
- query = xasprintf("ALL component:\"%s\" whiteboard:\"%s\"", component, duphash); |
42 |
+ query = xasprintf("ALL cf_rpmpkg:\"%s\" whiteboard:\"%s\"", component, duphash); |
43 |
else |
44 |
{ |
45 |
char *product = NULL; |
46 |
char *version = NULL; |
47 |
parse_release_for_bz(release, &product, &version); |
48 |
- query = xasprintf("ALL component:\"%s\" whiteboard:\"%s\" product:\"%s\"", |
49 |
+ query = xasprintf("ALL cf_rpmpkg:\"%s\" whiteboard:\"%s\" product:\"%s\"", |
50 |
component, duphash, product |
51 |
); |
52 |
free(product); |
53 |
@@ -466,18 +466,26 @@ xmlrpc_int32 ctx::new_bug(problem_data_t *problem_data, int depend_on_bugno) |
54 |
char *version = NULL; |
55 |
parse_release_for_bz(release, &product, &version); |
56 |
|
57 |
+ /*std::string bugzilla_arch; |
58 |
+ if (arch.compare("i686")) { |
59 |
+ bugzilla_arch = "i586"; |
60 |
+ } else { |
61 |
+ bugzilla_arch = arch; |
62 |
+ }*/ |
63 |
+ |
64 |
xmlrpc_value* result = NULL; |
65 |
char *summary = strbuf_free_nobuf(buf_summary); |
66 |
if (depend_on_bugno > -1) |
67 |
{ |
68 |
result = call("Bug.create", "({s:s,s:s,s:s,s:s,s:s,s:s,s:s,s:i})", |
69 |
"product", product, |
70 |
- "component", component, |
71 |
+ "component", "Core Packages", |
72 |
+ "cf_rpmpkg", package, |
73 |
"version", version, |
74 |
"summary", summary, |
75 |
"description", full_dsc, |
76 |
"status_whiteboard", status_whiteboard, |
77 |
- "platform", arch, |
78 |
+ "platform", arch, |
79 |
"dependson", depend_on_bugno |
80 |
); |
81 |
} |
82 |
@@ -649,7 +657,7 @@ static void report_to_bugzilla( |
83 |
env = getenv("Bugzilla_BugzillaURL"); |
84 |
bugzilla_url = env ? env : get_map_string_item_or_empty(settings, "BugzillaURL"); |
85 |
if (!bugzilla_url[0]) |
86 |
- bugzilla_url = "https://bugzilla.redhat.com"; |
87 |
+ bugzilla_url = "https://bugs.mageia.org/"; |
88 |
bugzilla_xmlrpc = xasprintf("%s"XML_RPC_SUFFIX, bugzilla_url); |
89 |
|
90 |
env = getenv("Bugzilla_SSLVerify"); |
91 |
diff --git a/src/plugins/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf |
92 |
index f1a77f5..1736c1d 100644 |
93 |
--- a/src/plugins/report_Bugzilla.conf |
94 |
+++ b/src/plugins/report_Bugzilla.conf |
95 |
@@ -1,4 +1,4 @@ |
96 |
-Bugzilla_BugzillaURL = https://bugzilla.redhat.com |
97 |
+Bugzilla_BugzillaURL = https://bugs.mageia.org |
98 |
Bugzilla_Login = |
99 |
Bugzilla_Password = |
100 |
Bugzilla_SSLVerify = yes |
101 |
diff --git a/src/plugins/report_Bugzilla.xml b/src/plugins/report_Bugzilla.xml |
102 |
index 6b119af..991bf67 100644 |
103 |
--- a/src/plugins/report_Bugzilla.xml |
104 |
+++ b/src/plugins/report_Bugzilla.xml |
105 |
@@ -57,18 +57,18 @@ |
106 |
<description xml:lang="uk">Адреса сервера Bugzilla</description> |
107 |
<description xml:lang="zh_CN">Bugzilla 服务器地址</description> |
108 |
<description xml:lang="zh_TW">Bugzilla 伺服器的位址</description> |
109 |
- <default-value>https://bugzilla.redhat.com</default-value> |
110 |
- <note-html>You can create bugzilla.redhat.com account <a href="https://bugzilla.redhat.com/createaccount.cgi">here</a></note-html> |
111 |
- <note-html xml:lang="da">Du kan oprette en bugzilla.redhat.com-konto <a href="https://bugzilla.redhat.com/createaccount.cgi">her</a></note-html> |
112 |
- <note-html xml:lang="es">Puede crear una cuenta bugzilla.redhat.com <a href="https://bugzilla.redhat.com/createaccount.cgi">aquí</a></note-html> |
113 |
- <note-html xml:lang="fi">Voit luoda bugzilla.redhat.com-tilin <a href="https://bugzilla.redhat.com/createaccount.cgi">täällä</a></note-html> |
114 |
- <note-html xml:lang="he">ניתן ליצור חשבון ב־bugzilla.redhat.com <a href="https://bugzilla.redhat.com/createaccount.cgi">כאן</a></note-html> |
115 |
- <note-html xml:lang="nl">Je kunt bugzilla.redhat.com account <a href="https://bugzilla.redhat.com/createaccount.cgi">hier</a> aanmaken</note-html> |
116 |
- <note-html xml:lang="pl">Można utworzyć konto w witrynie bugzilla.redhat.com <a href="https://bugzilla.redhat.com/createaccount.cgi">pod tym adresem</a></note-html> |
117 |
- <note-html xml:lang="pt_BR">Você pode criar uma conta no bugzilla.redhat.com <a href="https://bugzilla.redhat.com/createaccount.cgi">aqui</a></note-html> |
118 |
- <note-html xml:lang="uk">Створити обліковий запис bugzilla.redhat.com можна <a href="https://bugzilla.redhat.com/createaccount.cgi">тут</a></note-html> |
119 |
- <note-html xml:lang="zh_CN">您可以到 <a href="https://bugzilla.redhat.com/createaccount.cgi">这里</a> 创建 bugzilla.redhat.com 账户 </note-html> |
120 |
- <note-html xml:lang="zh_TW">您可以 <a href="https://bugzilla.redhat.com/createaccount.cgi">從這裡</a> 建立 bugzilla.redhat.com 帳號</note-html> |
121 |
+ <default-value>https://bugs.mageia.org</default-value> |
122 |
+ <note-html>You can create bugs.mageia.org account <a href="https://identity.mageia.org/register">here</a></note-html> |
123 |
+ <note-html xml:lang="da">Du kan oprette en bugs.mageia.org-konto <a href="https://identity.mageia.org/register">her</a></note-html> |
124 |
+ <note-html xml:lang="es">Puede crear una cuenta bugs.mageia.org <a href="https://identity.mageia.org/register">aquí</a></note-html> |
125 |
+ <note-html xml:lang="fi">Voit luoda bugs.mageia.org-tilin <a href="https://identity.mageia.org/register">täällä</a></note-html> |
126 |
+ <note-html xml:lang="he">ניתן ליצור חשבון ב־bugs.mageia.org <a href="https://identity.mageia.org/register">כאן</a></note-html> |
127 |
+ <note-html xml:lang="nl">Je kunt bugs.mageia.org account <a href="https://identity.mageia.org/register">hier</a> aanmaken</note-html> |
128 |
+ <note-html xml:lang="pl">Można utworzyć konto w witrynie bugs.mageia.org <a href="https://identity.mageia.org/register">pod tym adresem</a></note-html> |
129 |
+ <note-html xml:lang="pt_BR">Você pode criar uma conta no bugs.mageia.org <a href="https://identity.mageia.org/register">aqui</a></note-html> |
130 |
+ <note-html xml:lang="uk">Створити обліковий запис bugs.mageia.org можна <a href="https://identity.mageia.org/register">тут</a></note-html> |
131 |
+ <note-html xml:lang="zh_CN">您可以到 <a href="https://identity.mageia.org/register">这里</a> 创建 bugs.mageia.org 账户 </note-html> |
132 |
+ <note-html xml:lang="zh_TW">您可以 <a href="https://identity.mageia.org/register">從這裡</a> 建立 bugs.mageia.org 帳號</note-html> |
133 |
</option> |
134 |
<option type="text" name="Bugzilla_Login"> |
135 |
<label>User name</label> |
136 |
@@ -164,4 +164,4 @@ |
137 |
<default-value>yes</default-value> |
138 |
</option> |
139 |
</options> |
140 |
-</event> |
141 |
\ No newline at end of file |
142 |
+</event> |
143 |
diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in |
144 |
index 8a53f61..0e0a444 100644 |
145 |
--- a/src/plugins/report_Bugzilla.xml.in |
146 |
+++ b/src/plugins/report_Bugzilla.xml.in |
147 |
@@ -7,8 +7,8 @@ |
148 |
<_label>Bugzilla URL</_label> |
149 |
<allow-empty>no</allow-empty> |
150 |
<_description>Address of Bugzilla server</_description> |
151 |
- <default-value>https://bugzilla.redhat.com</default-value> |
152 |
- <_note-html>You can create bugzilla.redhat.com account <a href="https://bugzilla.redhat.com/createaccount.cgi">here</a></_note-html> |
153 |
+ <default-value>https://bug.mageia.org</default-value> |
154 |
+ <_note-html>You can create bugzilla.redhat.com account <a href="https://identity.mageia.org/register">here</a></_note-html> |
155 |
</option> |
156 |
<option type="text" name="Bugzilla_Login"> |
157 |
<_label>User name</_label> |