rpms/system-config-printer/F-11 system-config-printer-empty-class.patch, NONE, 1.1 system-config-printer.spec, 1.348, 1.349

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-empty-class.patch 
Log Message:
* Mon Mar  1 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-4
- Allow IPP_INTERNAL_ERROR when fetching PPD for empty class (bug #567902).


system-config-printer-empty-class.patch:
 system-config-printer.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE system-config-printer-empty-class.patch ---
diff -up system-config-printer-1.1.17/system-config-printer.py.empty-class system-config-printer-1.1.17/system-config-printer.py
--- system-config-printer-1.1.17/system-config-printer.py.empty-class	2010-03-01 15:20:14.657609424 +0000
+++ system-config-printer-1.1.17/system-config-printer.py	2010-03-01 15:20:40.606734378 +0000
@@ -2331,8 +2331,12 @@ class GUI(GtkGUI, monitor.Watcher):
             if self.ppd_local != False:
                 self.ppd_local.localize()
         except cups.IPPError, (e, m):
-            # Some IPP error other than IPP_NOT_FOUND.
-            show_IPP_Error(e, m, self.PrintersWindow)
+            # We might get IPP_INTERNAL_ERROR if this is a memberless
+            # class.
+            if e != cups.IPP_INTERNAL_ERROR:
+                # Some IPP error other than IPP_NOT_FOUND.
+                show_IPP_Error(e, m, self.PrintersWindow)
+
             # Treat it as a raw queue.
             self.ppd = False
         except RuntimeError:


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -p -r1.348 -r1.349
--- system-config-printer.spec	22 Feb 2010 11:41:35 -0000	1.348
+++ system-config-printer.spec	1 Mar 2010 15:35:51 -0000	1.349
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.17
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,6 +17,7 @@ Source2: http://cyberelk.net/tim/data/py
 
 Patch1: system-config-printer-device-settings.patch
 Patch2: system-config-printer-cupsGetPPD2.patch
+Patch3: system-config-printer-empty-class.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -66,6 +67,7 @@ the configuration tool.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .device-settings
 %patch2 -p1 -b .cupsGetPPD2
+%patch3 -p1 -b .empty-class
 
 %build
 %configure
@@ -172,6 +174,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Mar  1 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-4
+- Allow IPP_INTERNAL_ERROR when fetching PPD for empty class (bug #567902).
+
 * Mon Feb 22 2010 Jiri Popelka <jpopelka at redhat.com> 1.1.17-3
 - Catch RuntimeError in statereason.py when cupsGetPPD2 fails (bug #566938).