rpms/system-config-printer/devel system-config-printer-cupsGetPPD2.patch, NONE, 1.1 system-config-printer.spec, 1.360, 1.361

[Jiří Popelka]

Author: jpopelka

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

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.92-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.92/statereason.py.cupsGetPPD2 system-config-printer-1.1.92/statereason.py
--- system-config-printer-1.1.92/statereason.py.cupsGetPPD2	2010-02-18 16:17:48.000000000 +0100
+++ system-config-printer-1.1.92/statereason.py	2010-02-22 12:10:09.000000000 +0100
@@ -138,7 +138,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/devel/system-config-printer.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -p -r1.360 -r1.361
--- system-config-printer.spec	21 Feb 2010 19:05:37 -0000	1.360
+++ system-config-printer.spec	22 Feb 2010 11:39:54 -0000	1.361
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-no-epydoc.patch
 Patch2: system-config-printer-lowercase-mfg-mdl.patch
 Patch3: system-config-printer-device-ids-warning.patch
+Patch4: system-config-printer-cupsGetPPD2.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -79,6 +80,7 @@ printers.
 %patch1 -p1 -b .no-epydoc
 %patch2 -p1 -b .lowercase-mfg-mdl
 %patch3 -p1 -b .device-ids-warning
+%patch4 -p1 -b .cupsGetPPD2
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -194,6 +196,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Feb 22 2010 Jiri Popelka <jpopelka at redhat.com> 1.1.92-3
+- Catch RuntimeError in statereason.py when cupsGetPPD2 fails (bug #566938).
+
 * Sun Feb 21 2010 Tim Waugh <twaugh at redhat.com> - 1.1.92-2
 - Display a warning when the wrong IEEE 1284 Device ID is detected.