report-0.18-el6_example.patch (7,726 bytes)
diff -uNr report-0.18.orig/etc/report.d/bugzilla.redhat.com.conf report-0.18/etc/report.d/bugzilla.redhat.com.conf
--- report-0.18.orig/etc/report.d/bugzilla.redhat.com.conf 2010-06-19 12:02:06.000000000 -0400
+++ report-0.18/etc/report.d/bugzilla.redhat.com.conf 2010-11-30 04:36:07.000000000 -0500
@@ -1,7 +1,7 @@
-[bugzilla.redhat.com]
+[bugzilla.centos.org]
# plugin
plugin=bugzilla
# rhbz url
-bugzilla_host=bugzilla.redhat.com
+bugzilla_host=bugzilla.centos.org
diff -uNr report-0.18.orig/etc/report.d/RHEL-bugzilla.redhat.com.conf report-0.18/etc/report.d/RHEL-bugzilla.redhat.com.conf
--- report-0.18.orig/etc/report.d/RHEL-bugzilla.redhat.com.conf 2010-06-17 14:06:07.000000000 -0400
+++ report-0.18/etc/report.d/RHEL-bugzilla.redhat.com.conf 2010-11-30 04:41:33.000000000 -0500
@@ -1,4 +1,4 @@
-[RHEL-bugzilla.redhat.com]
+[RHEL-bugzilla.centos.org]
plugin=RHEL-bugzilla
-bugzilla_host=bugzilla.redhat.com
+bugzilla_host=bugzilla.centos.org
diff -uNr report-0.18.orig/etc/report.d/RHEL.conf report-0.18/etc/report.d/RHEL.conf
--- report-0.18.orig/etc/report.d/RHEL.conf 2010-11-30 04:33:34.000000000 -0500
+++ report-0.18/etc/report.d/RHEL.conf 2010-11-30 04:39:33.000000000 -0500
@@ -1,4 +1,4 @@
-[Red Hat Global Support]
+[CentOS Global Support]
priority=1
@@ -7,10 +7,10 @@
# strataURL is the base URL of the Strata server
# if not set, strataURL defaults to http://<strata_host>/Strata
-strataURL = https://api.access.redhat.com/rs
+strataURL = https://api.access.centos.org/rs
-buttonURLPattern = api.access.redhat.com/rs
-buttonURLRepl = access.redhat.com/support
+buttonURLPattern = api.access.centos.org/rs
+buttonURLRepl = access.centos.org/support
# if strataURL is not set, strata_host can be, and is used to
# create the default strataURL
@@ -21,7 +21,7 @@
#strata_host = access.redhat.com
-[Red Hat Global Support (FTP)]
+[CentOS Global Support (FTP)]
priority=2
@@ -30,4 +30,4 @@
# urldir is the directory that the report should be uploaded to
# it must be formatted as a URL, and must be a directory
-urldir=ftp://dropbox.redhat.com/incoming
+urldir=ftp://dropbox.centos.org/incoming
diff -uNr report-0.18.orig/etc/report.d/strata-test.conf report-0.18/etc/report.d/strata-test.conf
--- report-0.18.orig/etc/report.d/strata-test.conf 2010-11-30 04:33:34.000000000 -0500
+++ report-0.18/etc/report.d/strata-test.conf 2010-11-30 04:42:50.000000000 -0500
@@ -9,8 +9,8 @@
sslcertdata = INSECURE
-buttonURLPattern = api.avalon-ci.gss.redhat.com/rs
-buttonURLRepl = avalon-ci.gss.redhat.com/support
+buttonURLPattern = api.avalon-ci.gss.centos.org/rs
+buttonURLRepl = avalon-ci.gss.centos.org/support
# if strataURL is not set, strata_host can be, and is used to
# create the default strataURL
diff -uNr report-0.18.orig/python/bin/report report-0.18/python/bin/report
--- report-0.18.orig/python/bin/report 2010-11-30 04:33:34.000000000 -0500
+++ report-0.18/python/bin/report 2010-11-30 04:47:25.000000000 -0500
@@ -47,7 +47,7 @@
except:
pass
-Username_account_name = "bugzilla.redhat.com"
+Username_account_name = "bugzilla.centos.org"
Username_config_filename = None
try:
Username_config_filename = os.environ['HOME'] + "/.report_username_for_" + Username_account_name
diff -uNr report-0.18.orig/python/bin/report.1 report-0.18/python/bin/report.1
--- report-0.18.orig/python/bin/report.1 2010-06-19 12:02:06.000000000 -0400
+++ report-0.18/python/bin/report.1 2010-11-30 04:47:56.000000000 -0500
@@ -58,4 +58,4 @@
.fi
.SH "BUGS"
-File a ticket within http://bugzilla.redhat.com/
+File a ticket within http://bugzilla.centos.org/
diff -uNr report-0.18.orig/python/report/plugins/bugzilla/filer.py report-0.18/python/report/plugins/bugzilla/filer.py
--- report-0.18.orig/python/report/plugins/bugzilla/filer.py 2010-06-19 20:45:49.000000000 -0400
+++ report-0.18/python/report/plugins/bugzilla/filer.py 2010-11-30 04:49:59.000000000 -0500
@@ -24,8 +24,8 @@
from report import _report as _
import report.release_information
-_hardcoded_default_product = 'Fedora'
-_hardcoded_default_version = 'rawhide'
+_hardcoded_default_product = 'CentOS'
+_hardcoded_default_version = '6'
_hardcoded_default_product_for_bugzilla = _hardcoded_default_product
def getProduct():
diff -uNr report-0.18.orig/python/report/plugins/RHEL-bugzilla/bugzillaCopy/base.py report-0.18/python/report/plugins/RHEL-bugzilla/bugzillaCopy/base.py
--- report-0.18.orig/python/report/plugins/RHEL-bugzilla/bugzillaCopy/base.py 2010-06-30 12:50:30.000000000 -0400
+++ report-0.18/python/report/plugins/RHEL-bugzilla/bugzillaCopy/base.py 2010-11-30 04:55:01.000000000 -0500
@@ -56,7 +56,7 @@
class BugzillaBase(object):
'''An object which represents the data and methods exported by a Bugzilla
instance. Uses xmlrpclib to do its thing. You'll want to create one thusly:
- bz=Bugzilla(url='https://bugzilla.redhat.com/xmlrpc.cgi',user=u,password=p)
+ bz=Bugzilla(url='https://bugzilla.centos.org/xmlrpc.cgi',user=u,password=p)
You can get authentication cookies by calling the login() method. These
cookies will be stored in a MozillaCookieJar-style file specified by the
@@ -738,7 +738,7 @@
Important custom fields (used by RH Bugzilla and maybe others):
DEFAULTED:
bug_file_loc: URL pointing to additional information for bug report.
- Ex: http://username.fedorapeople.org/logs/crashlog.txt
+ Ex: http://username.centos.org/logs/crashlog.txt
reporter: Bugzilla username to use as reporter.
OPTIONAL:
blocked: List of bug ids this report blocks.
@@ -1130,8 +1130,8 @@
'''Set any of the assigned_to, reporter, or qa_contact fields to a new
bugzilla account, with an optional comment, e.g.
setassignee(reporter='sadguy@brokencomputer.org',
- assigned_to='wwoods@redhat.com')
- setassignee(qa_contact='wwoods@redhat.com',comment='wwoods QA ftw')
+ assigned_to='wwoods@centos.org')
+ setassignee(qa_contact='wwoods@centos.org',comment='wwoods QA ftw')
You must set at least one of the three assignee fields, or this method
will throw a ValueError.
Returns [bug_id, mailresults].'''
diff -uNr report-0.18.orig/python/report/plugins/RHEL-bugzilla/filer.py report-0.18/python/report/plugins/RHEL-bugzilla/filer.py
--- report-0.18.orig/python/report/plugins/RHEL-bugzilla/filer.py 2010-06-19 20:45:49.000000000 -0400
+++ report-0.18/python/report/plugins/RHEL-bugzilla/filer.py 2010-11-30 04:51:04.000000000 -0500
@@ -24,9 +24,9 @@
from report import _report as _
import report.release_information
-_hardcoded_default_product = 'Red Hat Enterprise Linux'
+_hardcoded_default_product = 'CentOS'
_hardcoded_default_version = '6.0'
-_hardcoded_default_product_for_bugzilla = 'Red Hat Enterprise Linux 6'
+_hardcoded_default_product_for_bugzilla = 'CentOS 6'
def getProduct():
product = report.release_information.getProduct()
diff -uNr report-0.18.orig/python/report/release_information.py report-0.18/python/report/release_information.py
--- report-0.18.orig/python/report/release_information.py 2010-11-30 04:33:34.000000000 -0500
+++ report-0.18/python/report/release_information.py 2010-11-30 05:00:27.000000000 -0500
@@ -51,8 +51,8 @@
if os.path.exists(each_path):
file = open(each_path, "r")
content = file.read()
- if content.startswith("Red Hat Enterprise Linux"):
- return "Red Hat Enterprise Linux"
+ if content.startswith("CentOS"):
+ return "CentOS"
if content.startswith("Fedora"):
return "Fedora"
