/[packages]/cauldron/abrt/current/SOURCES/abrt-mageiabugzilla.patch
ViewVC logotype

Annotation of /cauldron/abrt/current/SOURCES/abrt-mageiabugzilla.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 83124 - (hide annotations) (download)
Mon Apr 11 00:02:55 2011 UTC (10 years, 3 months ago) by dmorgan
File size: 6959 byte(s)
SILENT: new file ./SOURCES/abrt-mageiabugzilla.patch
1 dmorgan 83124 diff --git a/lib/Plugins/Bugzilla.conf b/lib/Plugins/Bugzilla.conf
2     index 4eebd99..e1d98c4 100644
3     --- a/lib/Plugins/Bugzilla.conf
4     +++ b/lib/Plugins/Bugzilla.conf
5 blino 21273 @@ -1,7 +1,7 @@
6     Enabled = yes
7    
8     # Bugzilla URL
9     -BugzillaURL = https://bugzilla.redhat.com/
10 dmorgan 83124 +BugzillaURL = https://bugs.mageia.org
11 blino 21273 # yes means that ssl certificates will be checked
12     SSLVerify = yes
13     # your login has to exist, if you don have any, please create one
14 dmorgan 83124 diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp
15     index 49c8781..0e49d1c 100644
16     --- a/lib/Plugins/Bugzilla.cpp
17     +++ b/lib/Plugins/Bugzilla.cpp
18     @@ -328,13 +328,13 @@ xmlrpc_value* ctx::call_quicksearch_duphash(const char* component, const char* r
19 blino 21273 {
20     char *query = NULL;
21     if (!release)
22     - query = xasprintf("ALL component:\"%s\" whiteboard:\"%s\"", component, duphash);
23     + query = xasprintf("ALL cf_rpmpkg:\"%s\" whiteboard:\"%s\"", component, duphash);
24     else
25     {
26     char *product = NULL;
27     char *version = NULL;
28 dmorgan 83124 parse_release_for_bz(release, &product, &version);
29 blino 21273 - query = xasprintf("ALL component:\"%s\" whiteboard:\"%s\" product:\"%s\"",
30     + query = xasprintf("ALL cf_rpmpkg:\"%s\" whiteboard:\"%s\" product:\"%s\"",
31     component, duphash, product
32     );
33     free(product);
34 dmorgan 83124 @@ -495,17 +495,25 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData, int depend_on_bugn
35 blino 21273 char *version = NULL;
36 dmorgan 83124 parse_release_for_bz(release.c_str(), &product, &version);
37 blino 21273
38     + std::string bugzilla_arch;
39     + if (arch.compare("i686")) {
40     + bugzilla_arch = "i586";
41     + } else {
42     + bugzilla_arch = arch;
43     + }
44     +
45     xmlrpc_value* result = NULL;
46     if (depend_on_bugno > -1)
47     {
48     result = call("Bug.create", "({s:s,s:s,s:s,s:s,s:s,s:s,s:s,s:i})",
49     "product", product,
50     - "component", component.c_str(),
51     + "component", "Core Packages",
52     + "cf_rpmpkg", package.c_str(),
53     "version", version,
54     "summary", summary.c_str(),
55     "description", description.c_str(),
56     "status_whiteboard", status_whiteboard.c_str(),
57     - "platform", arch.c_str(),
58     + "platform", bugzilla_arch.c_str(),
59     "dependson", depend_on_bugno
60     );
61     }
62 dmorgan 83124 @@ -715,8 +723,8 @@ static map_plugin_settings_t parse_settings(const map_plugin_settings_t& pSettin
63 blino 21273
64     CReporterBugzilla::CReporterBugzilla() :
65     m_bSSLVerify(true),
66     - m_sBugzillaURL("https://bugzilla.redhat.com"),
67     - m_sBugzillaXMLRPC("https://bugzilla.redhat.com"XML_RPC_SUFFIX),
68 blino 21492 + m_sBugzillaURL("https://bugs.mageia.org"),
69     + m_sBugzillaXMLRPC("https://bugs.mageia.org"XML_RPC_SUFFIX),
70 blino 21273 m_bRatingRequired(true)
71     {}
72    
73 dmorgan 83124 @@ -882,12 +890,12 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData,
74 blino 21273 );
75     return bug_status;
76     }
77     - else if (all_bugs_size > 1)
78 dmorgan 83124 + /*else if (all_bugs_size > 1)
79 blino 21273 {
80     // When someone clones bug it has same duphash, so we can find more than 1.
81     // Need to be checked if component is same.
82     VERB3 log("Bugzilla has %u reports with same duphash '%s'", all_bugs_size, duphash.c_str());
83     - }
84     + }*/
85    
86     // decision based on state
87     update_client(_("Bug is already reported: %i"), bug_id);
88 dmorgan 83124 diff --git a/lib/Plugins/Bugzilla.glade b/lib/Plugins/Bugzilla.glade
89     index 5885025..09b115d 100644
90     --- a/lib/Plugins/Bugzilla.glade
91     +++ 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 &lt;a href="https://bugzilla.redhat.com/createaccount.cgi"&gt;here&lt;/a&gt;</property>
97     + <property name="label" translatable="yes">You can create it &lt;a href="https://identity.mageia.org"&gt;here&lt;/a&gt;</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 blino 21273 @@ -20,7 +20,7 @@ The \fIBugzilla.conf\fP configuration file contains several
106     entries in the format "Option = Value". The options are:
107     .SS BugzillaURL
108     The URL of the Bugzilla instance that you want to use, including the
109     -path to the xmlrpc. The default is https://bugzilla.redhat.com/xmlrpc.cgi
110 blino 21492 +path to the xmlrpc. The default is https://bugs.mageia.org/xmlrpc.cgi
111 blino 21273 .SS Login
112     Your Bugzilla login. If you have no Bugzilla account, you cannot
113     use the plugin.
114 dmorgan 83124 diff --git a/lib/Utils/DebugDump.cpp b/lib/Utils/DebugDump.cpp
115     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;

  ViewVC Help
Powered by ViewVC 1.1.28