rpms/system-config-printer/devel system-config-printer-ipp-nonfatal-exception.patch, NONE, 1.1 system-config-printer.spec, 1.263, 1.264

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27585

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-ipp-nonfatal-exception.patch 
Log Message:
* Wed Jun 24 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-2
- Avoid showing a non-fatal exception when adding an IPP printer
  (bug #507629).
- Fixed traceback when adding/modifying printer which could lead to
  display bugs (bug #507489).


system-config-printer-ipp-nonfatal-exception.patch:

--- NEW FILE system-config-printer-ipp-nonfatal-exception.patch ---
diff -up system-config-printer-1.1.8/system-config-printer.py.ipp-nonfatal-exception system-config-printer-1.1.8/system-config-printer.py
--- system-config-printer-1.1.8/system-config-printer.py.ipp-nonfatal-exception	2009-06-24 10:28:47.773317435 +0100
+++ system-config-printer-1.1.8/system-config-printer.py	2009-06-24 10:29:24.339192122 +0100
@@ -4167,6 +4167,8 @@ class NewPrinterGUI(GtkGUI):
                             self.entNPDescription.set_text (info)
                         if len (location) > 0:
                             self.entNPLocation.set_text (location)
+                    except RuntimeError:
+                        pass
                     except:
                         nonfatalException ()
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -r1.263 -r1.264
--- system-config-printer.spec	23 Jun 2009 11:30:57 -0000	1.263
+++ system-config-printer.spec	24 Jun 2009 09:45:25 -0000	1.264
@@ -15,6 +15,7 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 Patch1: system-config-printer-bug507489.patch
+Patch2: system-config-printer-ipp-nonfatal-exception.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,6 +66,7 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .bug507489
+%patch2 -p1 -b .ipp-nonfatal-exception
 
 %build
 %configure
@@ -167,7 +169,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Tue Jun 23 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-2
+* Wed Jun 24 2009 Tim Waugh <twaugh at redhat.com> 1.1.8-2
+- Avoid showing a non-fatal exception when adding an IPP printer
+  (bug #507629).
 - Fixed traceback when adding/modifying printer which could lead to
   display bugs (bug #507489).