rpms/system-config-printer/F-11 system-config-printer-localize-statereason.patch, NONE, 1.1 system-config-printer.spec, 1.308, 1.309

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-localize-statereason.patch 
Log Message:
* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
- Handle RuntimeError when localizing state reason (bug #543937).


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

--- NEW FILE system-config-printer-localize-statereason.patch ---
diff -up system-config-printer-1.1.15/statereason.py.localize-statereason system-config-printer-1.1.15/statereason.py
--- system-config-printer-1.1.15/statereason.py.localize-statereason	2009-11-30 12:43:08.000000000 +0000
+++ system-config-printer-1.1.15/statereason.py	2009-12-03 14:57:17.285051607 +0000
@@ -138,7 +138,7 @@ class StateReason:
                     reason = localized_reason[:-2]
                 else:
                     reason = self.get_reason()
-            except cups.IPPError:
+            except (cups.IPPError, RuntimeError):
                 reason = self.get_reason()
 
             text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -p -r1.308 -r1.309
--- system-config-printer.spec	30 Nov 2009 13:04:44 -0000	1.308
+++ system-config-printer.spec	3 Dec 2009 15:03:00 -0000	1.309
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ 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-localize-statereason.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -62,6 +64,7 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .localize-statereason
 
 %build
 %configure
@@ -164,6 +167,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Dec  3 2009 Tim Waugh <twaugh at redhat.com> - 1.1.15-2
+- Handle RuntimeError when localizing state reason (bug #543937).
+
 * Mon Nov 30 2009 Tim Waugh <twaugh at redhat.com> 1.1.15-1
 - 1.1.15:
   - Fixed traceback introduced by fix to bug #541882.