rpms/system-config-printer/F-12 system-config-printer-cupsGetPPD2.patch, NONE, 1.1 system-config-printer.spec, 1.358, 1.359

[Jiří Popelka]

Author: jpopelka

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-cupsGetPPD2.patch 
Log Message:
* Mon Feb 22 2010 Jiri Popelka <jpopelka at redhat.com> 1.1.17-3
- Catch RuntimeError in statereason.py when cupsGetPPD2 fails (bug #566938).


system-config-printer-cupsGetPPD2.patch:
 statereason.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE system-config-printer-cupsGetPPD2.patch ---
diff -up system-config-printer-1.1.17/statereason.py.cupsGetPPD2 system-config-printer-1.1.17/statereason.py
--- system-config-printer-1.1.17/statereason.py.cupsGetPPD2	2010-02-09 12:41:44.000000000 +0100
+++ system-config-printer-1.1.17/statereason.py	2010-02-22 12:15:49.000000000 +0100
@@ -134,7 +134,7 @@ class StateReason:
                     f = self.connection.getPPD(self.printer)
                     self._ppd = cups.PPD (f)
                     os.unlink (f)
-                except (cups.IPPError, OSError):
+                except (cups.IPPError, RuntimeError, OSError):
                     pass
 
             reason = self.get_reason ()


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -p -r1.358 -r1.359
--- system-config-printer.spec	11 Feb 2010 17:08:37 -0000	1.358
+++ system-config-printer.spec	22 Feb 2010 11:41:20 -0000	1.359
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.17
-Release: 2%{?dist}
+Release: 3%{?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-no-epydoc.patch
 Patch2: system-config-printer-device-settings.patch
+Patch3: system-config-printer-cupsGetPPD2.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -77,6 +78,7 @@ printers.
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .device-settings
+%patch3 -p1 -b .cupsGetPPD2
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -193,6 +195,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Feb 22 2010 Jiri Popelka <jpopelka at redhat.com> 1.1.17-3
+- Catch RuntimeError in statereason.py when cupsGetPPD2 fails (bug #566938).
+
 * Thu Feb 11 2010 Tim Waugh <twaugh at redhat.com> - 1.1.17-2
 - Avoid clearing device settings when adding printer (bug #563989).