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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 21273 - (hide annotations) (download)
Mon Jan 17 13:41:48 2011 UTC (10 years, 3 months ago) by blino
File size: 4482 byte(s)
imported package abrt
1 blino 21273 --- lib/Plugins/Bugzilla.glade
2     +++ lib/Plugins/Bugzilla.glade
3     @@ -183,7 +183,7 @@
4     <object class="GtkLabel" id="label4">
5     <property name="visible">True</property>
6     <property name="xpad">5</property>
7     - <property name="label" translatable="yes">You can create it &lt;a href="https://bugzilla.redhat.com/createaccount.cgi"&gt;here&lt;/a&gt;</property>
8     + <property name="label" translatable="yes">You can create it &lt;a href="https://qa.mandriva.com/createaccount.cgi"&gt;here&lt;/a&gt;</property>
9     <property name="use_markup">True</property>
10     <property name="selectable">True</property>
11     </object>
12    
13     --- lib/Plugins/Bugzilla.conf.mdvbugzilla 2010-07-28 15:11:10.000000000 +0200
14     +++ lib/Plugins/Bugzilla.conf 2010-08-10 11:50:36.000000000 +0200
15     @@ -1,7 +1,7 @@
16     Enabled = yes
17    
18     # Bugzilla URL
19     -BugzillaURL = https://bugzilla.redhat.com/
20     +BugzillaURL = https://qa.mandriva.com/
21     # yes means that ssl certificates will be checked
22     SSLVerify = yes
23     # your login has to exist, if you don have any, please create one
24    
25     --- lib/Plugins/Bugzilla.cpp.mdvbugzilla 2010-07-28 15:35:02.000000000 +0200
26     +++ lib/Plugins/Bugzilla.cpp 2010-08-10 12:02:06.000000000 +0200
27     @@ -328,13 +328,13 @@
28     {
29     char *query = NULL;
30     if (!release)
31     - query = xasprintf("ALL component:\"%s\" whiteboard:\"%s\"", component, duphash);
32     + query = xasprintf("ALL cf_rpmpkg:\"%s\" whiteboard:\"%s\"", component, duphash);
33     else
34     {
35     char *product = NULL;
36     char *version = NULL;
37     parse_release(release, &product, &version);
38     - query = xasprintf("ALL component:\"%s\" whiteboard:\"%s\" product:\"%s\"",
39     + query = xasprintf("ALL cf_rpmpkg:\"%s\" whiteboard:\"%s\" product:\"%s\"",
40     component, duphash, product
41     );
42     free(product);
43     @@ -418,17 +418,25 @@
44     char *version = NULL;
45     parse_release(release.c_str(), &product, &version);
46    
47     + std::string bugzilla_arch;
48     + if (arch.compare("i686")) {
49     + bugzilla_arch = "i586";
50     + } else {
51     + bugzilla_arch = arch;
52     + }
53     +
54     xmlrpc_value* result = NULL;
55     if (depend_on_bugno > -1)
56     {
57     result = call("Bug.create", "({s:s,s:s,s:s,s:s,s:s,s:s,s:s,s:i})",
58     "product", product,
59     - "component", component.c_str(),
60     + "component", "Core Packages",
61     + "cf_rpmpkg", package.c_str(),
62     "version", version,
63     "summary", summary.c_str(),
64     "description", description.c_str(),
65     "status_whiteboard", status_whiteboard.c_str(),
66     - "platform", arch.c_str(),
67     + "platform", bugzilla_arch.c_str(),
68     "dependson", depend_on_bugno
69     );
70     }
71     @@ -638,8 +646,8 @@
72    
73     CReporterBugzilla::CReporterBugzilla() :
74     m_bSSLVerify(true),
75     - m_sBugzillaURL("https://bugzilla.redhat.com"),
76     - m_sBugzillaXMLRPC("https://bugzilla.redhat.com"XML_RPC_SUFFIX),
77     + m_sBugzillaURL("https://qa.mandriva.com"),
78     + m_sBugzillaXMLRPC("https://qa.mandriva.com"XML_RPC_SUFFIX),
79     m_bRatingRequired(true)
80     {}
81    
82     @@ -804,12 +812,12 @@
83     );
84     return bug_status;
85     }
86     - else if (all_bugs_size > 1)
87     +/* else if (all_bugs_size > 1)
88     {
89     // When someone clones bug it has same duphash, so we can find more than 1.
90     // Need to be checked if component is same.
91     VERB3 log("Bugzilla has %u reports with same duphash '%s'", all_bugs_size, duphash.c_str());
92     - }
93     + }*/
94    
95     // decision based on state
96     update_client(_("Bug is already reported: %i"), bug_id);
97    
98    
99     --- lib/Plugins/abrt-Bugzilla.7
100     +++ lib/Plugins/abrt-Bugzilla.7
101     @@ -20,7 +20,7 @@ The \fIBugzilla.conf\fP configuration file contains several
102     entries in the format "Option = Value". The options are:
103     .SS BugzillaURL
104     The URL of the Bugzilla instance that you want to use, including the
105     -path to the xmlrpc. The default is https://bugzilla.redhat.com/xmlrpc.cgi
106     +path to the xmlrpc. The default is https://qa.mandriva.com/xmlrpc.cgi
107     .SS Login
108     Your Bugzilla login. If you have no Bugzilla account, you cannot
109     use the plugin.
110     --
111     1.7.1
112    

  ViewVC Help
Powered by ViewVC 1.1.28