- Remove untest attachfile code

- Catch ProtocolError
This commit is contained in:
Daniel J Walsh 2010-01-29 14:18:06 +00:00
parent aa7339b171
commit 57b22c8cd3
2 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,26 @@
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))

View File

@ -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/hicolor
%prep
%setup -q
%patch -p1
%build
%configure