rpms/setroubleshoot/F-12 setroubleshoot-protocol.patch, NONE, 1.1 setroubleshoot.spec, 1.184, 1.185

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9066

Modified Files:
	setroubleshoot.spec 
Added Files:
	setroubleshoot-protocol.patch 
Log Message:
* Fri Jan 22 2010 Dan Walsh <dwalsh at redhat.com> - 2.2.60-1
- Remove untest attachfile code
- Catch ProtocolError


setroubleshoot-protocol.patch:
 browser.py |    4 +---
 filer.py   |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE setroubleshoot-protocol.patch ---
diff -up setroubleshoot-2.2.60/src/browser.py~ setroubleshoot-2.2.60/src/browser.py
--- setroubleshoot-2.2.60/src/browser.py~	2010-01-22 09:20:37.000000000 -0500
+++ setroubleshoot-2.2.60/src/browser.py	2010-01-29 09:16:08.000000000 -0500
@@ -147,9 +147,7 @@ class BugReport:
                 return retval
             except CommunicationError, e:
                 msg = _("Your bug could not be filed due to the following error when communicating with bugzilla:\n\n%s" % str(e))
-            except ProtocolError, e:
-                msg = _("Your bug could not be filed due to the following error when communicating with bugzilla:\n\n%s" % str(e))
-            FailDialog(msg)
+                FailDialog(msg)
 
             return -1
 
diff -up setroubleshoot-2.2.60/src/filer.py~ setroubleshoot-2.2.60/src/filer.py
--- setroubleshoot-2.2.60/src/filer.py~	2009-12-21 11:28:48.000000000 -0500
+++ setroubleshoot-2.2.60/src/filer.py	2010-01-29 09:15:40.000000000 -0500
@@ -339,7 +339,7 @@ class BugzillaFiler(AbstractFiler):
         try:
             self._bz = bugzilla.Bugzilla(url=self.bugUrl)
             retval = self._bz.login(username, password)
-        except ProtocolError, e:
+        except xmlrpclib.ProtocolError, e:
             raise CommunicationError(str(e))
         except socket.error, e:
             raise CommunicationError(str(e))


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-12/setroubleshoot.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- setroubleshoot.spec	22 Jan 2010 15:09:06 -0000	1.184
+++ setroubleshoot.spec	29 Jan 2010 14:18:06 -0000	1.185
@@ -1,10 +1,11 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 2.2.60
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
+patch: setroubleshoot-protocol.patch
 Source0: %{name}-%{version}.tar.gz
 Source2: setroubleshoot.logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +95,7 @@ touch --no-create %{_datadir}/icons/hico
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure