diff --git a/hplip-silence-ioerror.patch b/hplip-silence-ioerror.patch new file mode 100644 index 0000000..013931b --- /dev/null +++ b/hplip-silence-ioerror.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.15.2/base/logger.py.silence-ioerror hplip-3.15.2/base/logger.py +--- hplip-3.15.2/base/logger.py.silence-ioerror 2015-03-16 16:48:12.750337907 +0000 ++++ hplip-3.15.2/base/logger.py 2015-03-16 16:48:34.850253564 +0000 +@@ -199,6 +199,8 @@ class Logger(object): + out.write('\n') + + out.flush() ++ except IOError: ++ pass + finally: + self._lock.release() + diff --git a/hplip.spec b/hplip.spec index 30e7435..60d687f 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.15.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ and MIT Url: http://hplip.sourceforge.net/ @@ -36,6 +36,7 @@ Patch19: hplip-reportlab.patch Patch20: hplip-dj990c-margin.patch Patch21: hplip-strncpy.patch Patch22: hplip-no-write-bytecode.patch +Patch23: hplip-silence-ioerror.patch %global hpijs_epoch 1 Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release} @@ -221,6 +222,9 @@ done # Don't try to write bytecode cache for hpfax backend (bug #1192761). %patch22 -p1 -b .no-write-bytecode +# Ignore IOError when logging output (bug #712537). +%patch23 -p1 -b .silence-ioerror + sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ prnt/drv/hpcups.drv.in @@ -473,6 +477,9 @@ rm -f ppds-all %postun libs -p /sbin/ldconfig %changelog +* Mon Mar 16 2015 Tim Waugh - 3.15.2-6 +- Ignore IOError when logging output (bug #712537). + * Fri Mar 13 2015 Tim Waugh - 3.15.2-5 - Requires python3-PyQt4, not PyQt4.