1 |
--- lib/Plugins/Bugzilla.glade |
diff --git a/lib/Plugins/Bugzilla.conf b/lib/Plugins/Bugzilla.conf |
2 |
+++ lib/Plugins/Bugzilla.glade |
index 4eebd99..e1d98c4 100644 |
3 |
@@ -183,7 +183,7 @@ |
--- a/lib/Plugins/Bugzilla.conf |
4 |
<object class="GtkLabel" id="label4"> |
+++ b/lib/Plugins/Bugzilla.conf |
|
<property name="visible">True</property> |
|
|
<property name="xpad">5</property> |
|
|
- <property name="label" translatable="yes">You can create it <a href="https://bugzilla.redhat.com/createaccount.cgi">here</a></property> |
|
|
+ <property name="label" translatable="yes">You can create it <a href="https://identity.mageia.org">here</a></property> |
|
|
<property name="use_markup">True</property> |
|
|
<property name="selectable">True</property> |
|
|
</object> |
|
|
|
|
|
--- lib/Plugins/Bugzilla.conf.mgabugzilla 2010-07-28 15:11:10.000000000 +0200 |
|
|
+++ lib/Plugins/Bugzilla.conf 2010-08-10 11:50:36.000000000 +0200 |
|
5 |
@@ -1,7 +1,7 @@ |
@@ -1,7 +1,7 @@ |
6 |
Enabled = yes |
Enabled = yes |
7 |
|
|
8 |
# Bugzilla URL |
# Bugzilla URL |
9 |
-BugzillaURL = https://bugzilla.redhat.com/ |
-BugzillaURL = https://bugzilla.redhat.com/ |
10 |
+BugzillaURL = https://bugs.mageia.org/ |
+BugzillaURL = https://bugs.mageia.org |
11 |
# yes means that ssl certificates will be checked |
# yes means that ssl certificates will be checked |
12 |
SSLVerify = yes |
SSLVerify = yes |
13 |
# your login has to exist, if you don have any, please create one |
# your login has to exist, if you don have any, please create one |
14 |
|
diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp |
15 |
--- lib/Plugins/Bugzilla.cpp.mgabugzilla 2010-07-28 15:35:02.000000000 +0200 |
index 49c8781..0e49d1c 100644 |
16 |
+++ lib/Plugins/Bugzilla.cpp 2010-08-10 12:02:06.000000000 +0200 |
--- a/lib/Plugins/Bugzilla.cpp |
17 |
@@ -328,13 +328,13 @@ |
+++ b/lib/Plugins/Bugzilla.cpp |
18 |
|
@@ -328,13 +328,13 @@ xmlrpc_value* ctx::call_quicksearch_duphash(const char* component, const char* r |
19 |
{ |
{ |
20 |
char *query = NULL; |
char *query = NULL; |
21 |
if (!release) |
if (!release) |
25 |
{ |
{ |
26 |
char *product = NULL; |
char *product = NULL; |
27 |
char *version = NULL; |
char *version = NULL; |
28 |
parse_release(release, &product, &version); |
parse_release_for_bz(release, &product, &version); |
29 |
- query = xasprintf("ALL component:\"%s\" whiteboard:\"%s\" product:\"%s\"", |
- query = xasprintf("ALL component:\"%s\" whiteboard:\"%s\" product:\"%s\"", |
30 |
+ query = xasprintf("ALL cf_rpmpkg:\"%s\" whiteboard:\"%s\" product:\"%s\"", |
+ query = xasprintf("ALL cf_rpmpkg:\"%s\" whiteboard:\"%s\" product:\"%s\"", |
31 |
component, duphash, product |
component, duphash, product |
32 |
); |
); |
33 |
free(product); |
free(product); |
34 |
@@ -418,17 +418,25 @@ |
@@ -495,17 +495,25 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData, int depend_on_bugn |
35 |
char *version = NULL; |
char *version = NULL; |
36 |
parse_release(release.c_str(), &product, &version); |
parse_release_for_bz(release.c_str(), &product, &version); |
37 |
|
|
38 |
+ std::string bugzilla_arch; |
+ std::string bugzilla_arch; |
39 |
+ if (arch.compare("i686")) { |
+ if (arch.compare("i686")) { |
59 |
"dependson", depend_on_bugno |
"dependson", depend_on_bugno |
60 |
); |
); |
61 |
} |
} |
62 |
@@ -638,8 +646,8 @@ |
@@ -715,8 +723,8 @@ static map_plugin_settings_t parse_settings(const map_plugin_settings_t& pSettin |
63 |
|
|
64 |
CReporterBugzilla::CReporterBugzilla() : |
CReporterBugzilla::CReporterBugzilla() : |
65 |
m_bSSLVerify(true), |
m_bSSLVerify(true), |
70 |
m_bRatingRequired(true) |
m_bRatingRequired(true) |
71 |
{} |
{} |
72 |
|
|
73 |
@@ -804,12 +812,12 @@ |
@@ -882,12 +890,12 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData, |
74 |
); |
); |
75 |
return bug_status; |
return bug_status; |
76 |
} |
} |
77 |
- else if (all_bugs_size > 1) |
- else if (all_bugs_size > 1) |
78 |
+/* else if (all_bugs_size > 1) |
+ /*else if (all_bugs_size > 1) |
79 |
{ |
{ |
80 |
// When someone clones bug it has same duphash, so we can find more than 1. |
// When someone clones bug it has same duphash, so we can find more than 1. |
81 |
// Need to be checked if component is same. |
// Need to be checked if component is same. |
85 |
|
|
86 |
// decision based on state |
// decision based on state |
87 |
update_client(_("Bug is already reported: %i"), bug_id); |
update_client(_("Bug is already reported: %i"), bug_id); |
88 |
|
diff --git a/lib/Plugins/Bugzilla.glade b/lib/Plugins/Bugzilla.glade |
89 |
|
index 5885025..09b115d 100644 |
90 |
--- lib/Plugins/abrt-Bugzilla.7 |
--- a/lib/Plugins/Bugzilla.glade |
91 |
+++ lib/Plugins/abrt-Bugzilla.7 |
+++ b/lib/Plugins/Bugzilla.glade |
92 |
|
@@ -183,7 +183,7 @@ |
93 |
|
<object class="GtkLabel" id="label4"> |
94 |
|
<property name="visible">True</property> |
95 |
|
<property name="xpad">5</property> |
96 |
|
- <property name="label" translatable="yes">You can create it <a href="https://bugzilla.redhat.com/createaccount.cgi">here</a></property> |
97 |
|
+ <property name="label" translatable="yes">You can create it <a href="https://identity.mageia.org">here</a></property> |
98 |
|
<property name="use_markup">True</property> |
99 |
|
<property name="selectable">True</property> |
100 |
|
</object> |
101 |
|
diff --git a/lib/Plugins/abrt-Bugzilla.7 b/lib/Plugins/abrt-Bugzilla.7 |
102 |
|
index 99bb60d..234c154 100644 |
103 |
|
--- a/lib/Plugins/abrt-Bugzilla.7 |
104 |
|
+++ b/lib/Plugins/abrt-Bugzilla.7 |
105 |
@@ -20,7 +20,7 @@ The \fIBugzilla.conf\fP configuration file contains several |
@@ -20,7 +20,7 @@ The \fIBugzilla.conf\fP configuration file contains several |
106 |
entries in the format "Option = Value". The options are: |
entries in the format "Option = Value". The options are: |
107 |
.SS BugzillaURL |
.SS BugzillaURL |
111 |
.SS Login |
.SS Login |
112 |
Your Bugzilla login. If you have no Bugzilla account, you cannot |
Your Bugzilla login. If you have no Bugzilla account, you cannot |
113 |
use the plugin. |
use the plugin. |
114 |
-- |
diff --git a/lib/Utils/DebugDump.cpp b/lib/Utils/DebugDump.cpp |
115 |
1.7.1 |
index 30ceacc..98ba99c 100644 |
116 |
|
--- a/lib/Utils/DebugDump.cpp |
117 |
|
+++ b/lib/Utils/DebugDump.cpp |
118 |
|
@@ -330,7 +330,7 @@ void CDebugDump::Create(const char *pDir, uid_t uid) |
119 |
|
SaveText(FILENAME_KERNEL, buf.release); |
120 |
|
SaveText(FILENAME_ARCHITECTURE, buf.machine); |
121 |
|
std::string release; |
122 |
|
- LoadTextFile("/etc/redhat-release", release); |
123 |
|
+ LoadTextFile("/etc/release", release); |
124 |
|
const char *release_ptr = release.c_str(); |
125 |
|
unsigned len_1st_str = strchrnul(release_ptr, '\n') - release_ptr; |
126 |
|
release.erase(len_1st_str); /* usually simply removes trailing '\n' */ |
127 |
|
diff --git a/lib/Utils/parse_release.cpp b/lib/Utils/parse_release.cpp |
128 |
|
index 4f780bf..96700db 100644 |
129 |
|
--- a/lib/Utils/parse_release.cpp |
130 |
|
+++ b/lib/Utils/parse_release.cpp |
131 |
|
@@ -26,24 +26,16 @@ |
132 |
|
// caller is reposible for freeing *product* and *version* |
133 |
|
static void parse_release(const char *release, char** product, char** version, bool append_rhel_version) |
134 |
|
{ |
135 |
|
- if (strstr(release, "Rawhide")) |
136 |
|
+ if (strstr(release, "Cauldron")) |
137 |
|
{ |
138 |
|
- *product = xstrdup("Fedora"); |
139 |
|
- *version = xstrdup("rawhide"); |
140 |
|
+ *product = xstrdup("Mageia"); |
141 |
|
+ *version = xstrdup("Cauldron"); |
142 |
|
VERB3 log("%s: version:'%s' product:'%s'", __func__, *version, *product); |
143 |
|
return; |
144 |
|
} |
145 |
|
|
146 |
|
struct strbuf *buf_product = strbuf_new(); |
147 |
|
- if (strstr(release, "Fedora")) |
148 |
|
- strbuf_append_str(buf_product, "Fedora"); |
149 |
|
- else if (strstr(release, "Red Hat Enterprise Linux")) |
150 |
|
- strbuf_append_str(buf_product, "Red Hat Enterprise Linux"); |
151 |
|
- else |
152 |
|
- { |
153 |
|
- /* TODO: add logic for parsing other distros' names here */ |
154 |
|
- strbuf_append_str(buf_product, release); |
155 |
|
- } |
156 |
|
+ strbuf_append_str(buf_product, "Mageia"); |
157 |
|
|
158 |
|
const char *r = strstr(release, "release"); |
159 |
|
const char *space = r ? strchr(r, ' ') : NULL; |