rpms/system-config-printer/devel system-config-printer-localize-statereason.patch, NONE, 1.1 system-config-printer.spec, 1.314, 1.315
Tim Waugh
twaugh at fedoraproject.org
Thu Dec 3 14:59:37 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12185
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/devel/system-config-printer.spec,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -p -r1.314 -r1.315
--- system-config-printer.spec 30 Nov 2009 13:01:52 -0000 1.314
+++ system-config-printer.spec 3 Dec 2009 14:59:37 -0000 1.315
@@ -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
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/py
Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
Patch1: system-config-printer-no-epydoc.patch
+Patch2: system-config-printer-localize-statereason.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@@ -76,6 +77,7 @@ printers.
%prep
%setup -q -a 1 -a 2
%patch1 -p1 -b .no-epydoc
+%patch2 -p1 -b .localize-statereason
%build
%configure --with-udev-rules --with-polkit-1
@@ -188,6 +190,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.
More information about the fedora-extras-commits
mailing list