rpms/terminator/devel terminator-0.14-catch_multiple_exceptions.patch, NONE, 1.1 terminator.spec, 1.8, 1.9

[Steven Fernandez]

Author: lonetwin

Update of /cvs/pkgs/rpms/terminator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31170

Modified Files:
	terminator.spec 
Added Files:
	terminator-0.14-catch_multiple_exceptions.patch 
Log Message:
- Fixes 567861. Added a patch to correctly catch multiple exceptions. Not
  sending upstream since the current upstream is a complete rewrite and this
  problem does not exist there.


terminator-0.14-catch_multiple_exceptions.patch:
 terminator.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE terminator-0.14-catch_multiple_exceptions.patch ---
diff -up terminator-0.14/terminatorlib/terminator.py.orig terminator-0.14/terminatorlib/terminator.py
--- terminator-0.14/terminatorlib/terminator.py.orig	2010-03-10 11:21:25.000000000 +0530
+++ terminator-0.14/terminatorlib/terminator.py	2010-03-10 11:23:22.164499238 +0530
@@ -1032,7 +1032,7 @@ class Terminator:
           if matcher (current_geo, possible_geo, best_geo):
             best_index = i
             best_geo = possible_geo
-        except TypeError, KeyError:
+        except (TypeError, KeyError):
           # Not being called on a Paned widget
           pass
     #if best_index is None:


Index: terminator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminator/devel/terminator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- terminator.spec	3 Mar 2010 14:59:38 -0000	1.8
+++ terminator.spec	10 Mar 2010 06:07:10 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           terminator
 Version:        0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Store and run multiple GNOME terminals in one window
 
 Group:          User Interface/Desktops
@@ -15,6 +15,9 @@ BuildArch:      noarch
 BuildRequires:  python-devel gettext desktop-file-utils intltool
 Requires:       vte gnome-python2-gconf GConf2 gtk2 desktop-file-utils
 Requires:       deskbar-applet gnome-python2-bonobo gnome-python2-canvas
+# This patch is temporary till we move to the current upstream release which is
+# a complete rewrite (and makes this patch unnecessary as such).
+Patch0:         terminator-0.14-catch_multiple_exceptions.patch
 
 %description
 Multiple GNOME terminals in one window.  This is a project to produce
@@ -26,6 +29,7 @@ arrangements of terminals for different 
 
 %prep
 %setup -qn %{name}-%{version}
+%patch -p1 -b .catch_multiple_exceptions
 sed -i '/#! \?\/usr.*/d' terminatorlib/*.py
 
 
@@ -68,6 +72,9 @@ gtk-update-icon-cache -qf %{_datadir}/ic
 
 
 %changelog
+* Wed Mar 10 2010 Steven Fernandez <lonetwin at fedoraproject.org> 0.14-3
+- Added patch to fix the traceback reported in bug 567861
+
 * Wed Mar 3 2010 Steven Fernandez <lonetwin at fedoraproject.org> - 0.14-2
 - Added dependency for deskbar-applets and gnome-python2-{bonobo,canvas}
   packages (bug 540551 and bug 509461)