- Remove untest attachfile code

- Catch ProtocolError
2010-01-29 14:18:06 +00:00 · 2010-01-22 15:09:06 +00:00 · 2010-01-22 14:01:20 +00:00 · 2010-01-22 13:57:23 +00:00 · 2010-01-20 19:53:51 +00:00 · 2010-01-18 21:33:21 +00:00
6 changed files with 767 additions and 630 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -44,3 +44,27 @@ setroubleshoot-2.2.28.tar.gz
 setroubleshoot-2.2.30.tar.gz
 setroubleshoot-2.2.31.tar.gz
 setroubleshoot-2.2.32.tar.gz
+setroubleshoot-2.2.33.tar.gz
+setroubleshoot-2.2.34.tar.gz
+setroubleshoot-2.2.35.tar.gz
+setroubleshoot-2.2.36.tar.gz
+setroubleshoot-2.2.37.tar.gz
+setroubleshoot-2.2.38.tar.gz
+setroubleshoot-2.2.39.tar.gz
+setroubleshoot-2.2.40.tar.gz
+setroubleshoot-2.2.41.tar.gz
+setroubleshoot-2.2.42.tar.gz
+setroubleshoot-2.2.43.tar.gz
+setroubleshoot-2.2.44.tar.gz
+setroubleshoot-2.2.45.tar.gz
+setroubleshoot-2.2.46.tar.gz
+setroubleshoot-2.2.47.tar.gz
+setroubleshoot-2.2.48.tar.gz
+setroubleshoot-2.2.50.tar.gz
+setroubleshoot-2.2.52.tar.gz
+setroubleshoot-2.2.55.tar.gz
+setroubleshoot-2.2.56.tar.gz
+setroubleshoot-2.2.57.tar.gz
+setroubleshoot-2.2.58.tar.gz
+setroubleshoot-2.2.59.tar.gz
+setroubleshoot-2.2.60.tar.gz
--- a/4
+++ b/4
@ -1,10 +1,10 @@
 # Makefile for source rpm: setroubleshoot
-# $Id: Makefile,v 1.1 2006/07/18 19:48:52 jdennis Exp $
+# $Id: Makefile,v 1.2 2007/10/15 19:22:37 notting Exp $
 NAME := setroubleshoot
 SPECFILE = $(firstword $(wildcard *.spec))

 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef

 MAKEFILE_COMMON := $(shell $(find-makefile-common))
--- a/1
+++ b/1
@ -0,0 +1 @@
+F-12
--- a/setroubleshoot-protocol.patch
+++ b/setroubleshoot-protocol.patch
@ -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))
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
--- a/2
+++ b/2
@ -1 +1 @@
-fac598f35d2071fea3133ed92bb3031d  setroubleshoot-2.2.32.tar.gz
+6e5b39bed02d14e1c44a630cfcb3c305  setroubleshoot-2.2.60.tar.gz
Author	SHA1	Message	Date
Daniel J Walsh	57b22c8cd3	- Remove untest attachfile code - Catch ProtocolError	2010-01-29 14:18:06 +00:00
Daniel J Walsh	aa7339b171	- Remove untest attachfile code - Catch ProtocolError	2010-01-22 15:09:06 +00:00
Daniel J Walsh	143629bfd7	- Remove untest attachfile code	2010-01-22 14:01:20 +00:00
Daniel J Walsh	73089f9e9a	- Remove untest attachfile code	2010-01-22 13:57:23 +00:00
Daniel J Walsh	1c1a326cff	- Fix remembering of bugzilla username/password	2010-01-20 19:53:51 +00:00
Daniel J Walsh	184af63055	- Don't crash on missing inode - Fix up default_encoding an translations	2010-01-18 21:33:21 +00:00
Daniel J Walsh	a126eb8ad4	- Cleanup spec file - Add default_encoding - Fix wording in bug report window	2010-01-13 20:20:40 +00:00
Daniel J Walsh	96cd9ba87c	- Fix ignore button - Add delete button	2009-12-03 22:04:25 +00:00
Daniel J Walsh	248ba23d7a	- Exit with error code if you run sealert as root and try to connect to session bus - Fix Crash when ino is not defined	2009-11-30 16:02:08 +00:00
Bill Nottingham	558e817cca	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:38:56 +00:00
Daniel J Walsh	3c8ab7130a	- Fix bug in substitute code	2009-11-18 15:18:02 +00:00
Daniel J Walsh	8c3a2f4891	- Fix semanage fcontext lines to substitute "." for " " in path - Update po	2009-11-16 22:16:29 +00:00
Daniel J Walsh	f6e1e4d3da	- Fix bugzilla reporting to work on RHEL6	2009-11-10 15:53:58 +00:00
Daniel J Walsh	d0dc08507e	- Do not translate hex files - Catch exception on non dbus system	2009-11-03 16:55:13 +00:00
Daniel J Walsh	ffa00c0adf	- Get version correct for both RHEL and Fedora	2009-11-02 15:54:36 +00:00
Daniel J Walsh	971c940d0b	- Fix crash on selinux disabled and bad /etc/redhat-release reporing of bugzillas	2009-10-30 20:59:53 +00:00
Daniel J Walsh	5d1c23ddf1	- Update po - Fix bugzilla reporting to handle LoadError exception Thu Oct 15 2009 Dan Walsh <dwalsh@redhat.com> - 2.2.41-1 - Add icon to browser	2009-10-26 14:07:42 +00:00
Daniel J Walsh	e5892494bb	- Fix up browser button handling when there are 0, 1 or more alerts	2009-10-15 14:31:42 +00:00
Daniel J Walsh	a67189251f	- Don't throw up an error box if yum cache is not setup	2009-10-07 21:13:56 +00:00
Jesse Keating	7930be81a3	Initialize branch F-12 for setroubleshoot	2009-09-29 06:50:19 +00:00