dev-python/python-report: patches for newer version

3 files changed, 96 insertions, 0 deletions

diff --git a/dev-python/python-report/files/python-report-0.23-disable-rpm.patch b/dev-python/python-report/files/python-report-0.23-disable-rpm.patch
new file mode 100644
index 0000000..501bb70
--- /dev/null
+++ b/dev-python/python-report/files/python-report-0.23-disable-rpm.patch
@@ -0,0 +1,20 @@
+diff -Nurp python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py python-report-0.10/python/report/templates/bugzilla-template/__init__.py
+--- python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py	2010-04-02 19:32:19.729109477 +0200
++++ python-report-0.10/python/report/templates/bugzilla-template/__init__.py	2010-04-02 19:32:54.640917830 +0200
+@@ -106,7 +106,6 @@ import filer
+ def sendToBugzilla(component, signature, io, bzfiler,
+                    optionsDict, fileName, fileDescription):
+ 
+-    import rpmUtils.arch
+ 
+     class BugzillaCommunicationException (Exception):
+         pass
+@@ -204,7 +203,7 @@ def sendToBugzilla(component, signature,
+             bug = withBugzillaDo(bzfiler, lambda b: b.createbug(product=bzfiler.getproduct(),
+                                            component=component,
+                                            version=bzfiler.getversion(),
+-                                           platform=rpmUtils.arch.getBaseArch(),
++                                           # platform=rpmUtils.arch.getBaseArch(),
+                                            bug_severity="medium",
+                                            priority="medium",
+                                            op_sys="Linux",
diff --git a/dev-python/python-report/files/python-report-0.23-fix-version-detection.patch b/dev-python/python-report/files/python-report-0.23-fix-version-detection.patch
new file mode 100644
index 0000000..d8f9b95
--- /dev/null
+++ b/dev-python/python-report/files/python-report-0.23-fix-version-detection.patch
@@ -0,0 +1,22 @@
+diff -Nurp python-report-0.10.orig//python/report/templates/bugzilla-template/filer.py python-report-0.10/python/report/templates/bugzilla-template/filer.py
+--- python-report-0.10.orig//python/report/templates/bugzilla-template/filer.py	2010-04-13 23:08:08.849090647 +0200
++++ python-report-0.10/python/report/templates/bugzilla-template/filer.py	2010-04-13 23:09:20.799052132 +0200
+@@ -61,15 +61,11 @@ def getVersion():
+         if os.path.exists(SYSTEM_VERSION_PATH):
+             file = open(SYSTEM_VERSION_PATH, "r")
+             content = file.read()
+-            if content.find("Rawhide") > -1:
+-                return "rawhide"
+-
+-            clist = content.split(" ")
+-            i = clist.index("release")
+-            return clist[i+1]
++            file.close()
++            return content.strip().split()[-1]
+         else:
+             # default to rawhide
+-            return "rawhide"
++            return "unknown"
+ 
+ class LoginError(Exception):
+     """An error occurred while logging into the bug reporting system."""
diff --git a/dev-python/python-report/files/python-report-0.23-sabayon-defaults.patch b/dev-python/python-report/files/python-report-0.23-sabayon-defaults.patch
new file mode 100644
index 0000000..4af6ec6
--- /dev/null
+++ b/dev-python/python-report/files/python-report-0.23-sabayon-defaults.patch
@@ -0,0 +1,54 @@
+diff -Nurp python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py python-report-0.10/python/report/templates/bugzilla-template/__init__.py
+--- python-report-0.10.orig/python/report/templates/bugzilla-template/__init__.py	2010-04-02 18:46:19.862030189 +0200
++++ python-report-0.10/python/report/templates/bugzilla-template/__init__.py	2010-04-02 18:56:47.102924468 +0200
+@@ -55,10 +55,10 @@ def displayURL(optionsDict):
+ def bugURL(optionsDict):
+     if 'bugURL' in optionsDict:
+         return optionsDict["bugURL"]
+-    host = "bugzilla.redhat.com"
++    host = "bugs.sabayon.org"
+     if 'bugzilla_host' in optionsDict:
+         host = optionsDict["bugzilla_host"]
+-    return "https://" + host + "/xmlrpc.cgi"
++    return "http://" + host + "/xmlrpc.cgi"
+ 
+ def report(signature, io, optionsDict):
+     if not io:
+@@ -130,8 +130,8 @@ def sendToBugzilla(component, signature,
+ 
+     try:
+         if not bzfiler:
+-            bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi",
+-                                          "http://bugzilla.redhat.com",
++            bzfiler = filer.BugzillaFiler("http://bugs.sabayon.org/xmlrpc.cgi",
++                                          "http://bugs.sabayon.org",
+                                           filer.getVersion(), filer.getProduct())
+ 
+         if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl:
+diff -Nurp python-report-0.10.orig/python/report/templates/RHEL-template/__init__.py python-report-0.10/python/report/templates/RHEL-template/__init__.py
+--- python-report-0.10.orig/python/report/templates/RHEL-template/__init__.py	2010-04-02 18:46:19.862030189 +0200
++++ python-report-0.10/python/report/templates/RHEL-template/__init__.py	2010-04-02 18:56:33.214921519 +0200
+@@ -55,10 +55,10 @@ def displayURL(optionsDict):
+ def bugURL(optionsDict):
+     if optionsDict.has_key("bugURL"):
+         return optionsDict["bugURL"]
+-    host = "bugzilla.redhat.com"
++    host = "bugs.sabayon.org"
+     if optionsDict.has_key("bugzilla_host"):
+         host = optionsDict["bugzilla_host"]
+-    return "https://" + host + "/xmlrpc.cgi"
++    return "http://" + host + "/xmlrpc.cgi"
+ 
+ def report(signature, io, optionsDict):
+     if not io:
+@@ -131,8 +131,8 @@ def sendToBugzilla( component, hashmarke
+ 
+     try:
+         if not bzfiler:
+-            bzfiler = filer.BugzillaFiler("https://bugzilla.redhat.com/xmlrpc.cgi",
+-                                          "http://bugzilla.redhat.com",
++            bzfiler = filer.BugzillaFiler("http://bugs.sabayon.org/xmlrpc.cgi",
++                                          "http://bugs.sabayon.org",
+                                           filer.getVersion(), filer.getProduct())
+ 
+         if not bzfiler or not bzfiler.supportsFiling() or not bzfiler.bugUrl: