- Catch RuntimeError in statereason.py when cupsGetPPD2 fails (bug
#566938).
This commit is contained in:
parent
61e6b02bb5
commit
cc516e8c5a
12
system-config-printer-cupsGetPPD2.patch
Normal file
12
system-config-printer-cupsGetPPD2.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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 ()
|
@ -7,7 +7,7 @@
|
|||||||
Summary: A printer administration tool
|
Summary: A printer administration tool
|
||||||
Name: system-config-printer
|
Name: system-config-printer
|
||||||
Version: 1.1.92
|
Version: 1.1.92
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://cyberelk.net/tim/software/system-config-printer/
|
URL: http://cyberelk.net/tim/software/system-config-printer/
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
|
|||||||
Patch1: system-config-printer-no-epydoc.patch
|
Patch1: system-config-printer-no-epydoc.patch
|
||||||
Patch2: system-config-printer-lowercase-mfg-mdl.patch
|
Patch2: system-config-printer-lowercase-mfg-mdl.patch
|
||||||
Patch3: system-config-printer-device-ids-warning.patch
|
Patch3: system-config-printer-device-ids-warning.patch
|
||||||
|
Patch4: system-config-printer-cupsGetPPD2.patch
|
||||||
|
|
||||||
BuildRequires: cups-devel >= 1.2
|
BuildRequires: cups-devel >= 1.2
|
||||||
BuildRequires: python-devel >= 2.4
|
BuildRequires: python-devel >= 2.4
|
||||||
@ -79,6 +80,7 @@ printers.
|
|||||||
%patch1 -p1 -b .no-epydoc
|
%patch1 -p1 -b .no-epydoc
|
||||||
%patch2 -p1 -b .lowercase-mfg-mdl
|
%patch2 -p1 -b .lowercase-mfg-mdl
|
||||||
%patch3 -p1 -b .device-ids-warning
|
%patch3 -p1 -b .device-ids-warning
|
||||||
|
%patch4 -p1 -b .cupsGetPPD2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-udev-rules --with-polkit-1
|
%configure --with-udev-rules --with-polkit-1
|
||||||
@ -194,6 +196,9 @@ rm -rf %buildroot
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 22 2010 Jiri Popelka <jpopelka@redhat.com> 1.1.92-3
|
||||||
|
- Catch RuntimeError in statereason.py when cupsGetPPD2 fails (bug #566938).
|
||||||
|
|
||||||
* Sun Feb 21 2010 Tim Waugh <twaugh@redhat.com> - 1.1.92-2
|
* Sun Feb 21 2010 Tim Waugh <twaugh@redhat.com> - 1.1.92-2
|
||||||
- Display a warning when the wrong IEEE 1284 Device ID is detected.
|
- Display a warning when the wrong IEEE 1284 Device ID is detected.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user