rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- When faxing, low ink/paper is not a problem (bug #238664).

Browse Source
This commit is contained in:
Tim Waugh 2007-05-04 16:42:29 +00:00
parent 4b5d27a8e3
commit b55bb59a80
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hplip-faxing-with-low-supplies.patch Normal file
View File

@ -0,0 +1,22 @@
--- hplip-1.7.2/sendfax.py.faxing-with-low-supplies 2007-02-27 22:30:34.000000000 +0000
+++ hplip-1.7.2/sendfax.py 2007-05-04 17:38:44.000000000 +0100
@@ -654,7 +654,7 @@
log.error("Query device error (%s)." % e.msg)
dev.error_state = ERROR_STATE_ERROR
- if dev.error_state > ERROR_STATE_MAX_OK:
+ if dev.error_state > ERROR_STATE_MAX_OK and dev.error_state != ERROR_STATE_LOW_SUPPLIES and dev.error_state != ERROR_STATE_LOW_PAPER:
log.error("Device is busy or in an error state (code=%d). Please wait for the device to become idle or clear the error and try again." % dev.error_state)
sys.exit(1)
--- hplip-1.7.2/ui/faxsendjobform.py.faxing-with-low-supplies 2007-02-28 22:35:18.000000000 +0000
+++ hplip-1.7.2/ui/faxsendjobform.py 2007-05-04 17:38:51.000000000 +0100
@@ -544,7 +544,7 @@
QApplication.restoreOverrideCursor()
- if self.dev.error_state > ERROR_STATE_MAX_OK:
+ if self.dev.error_state > ERROR_STATE_MAX_OK and self.dev.error_state != ERROR_STATE_LOW_SUPPLIES and self.dev.error_state != ERROR_STATE_LOW_PAPER:
self.FailureUI(self.__tr("<b>Device is busy or in an error state (code=%1)</b><p>Please wait for the device to become idle or clear the error and try again.").arg(self.dev.status_code))
return

9
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 1.7.2
Release: 8%{?dist}
Release: 9%{?dist}
License: GPL/MIT/BSD
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@ -22,6 +22,7 @@ Patch6: hplip-ipv6.patch
Patch7: hplip-marker-supply.patch
Patch8: hplip-libsane.patch
Patch9: hplip-media-empty.patch
Patch10: hplip-faxing-with-low-supplies.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires(post): /sbin/service
@ -108,6 +109,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Clear the media-empty-error printer state.
%patch9 -p1 -b .media-empty
# When faxing, low ink/paper is not a problem (bug #238664).
%patch10 -p1 -b .faxing-with-low-supplies
autoconf # for patch4
%build
@ -283,6 +287,9 @@ fi
exit 0
%changelog
* Fri May 4 2007 Tim Waugh <twaugh@redhat.com> 1.7.2-9
- When faxing, low ink/paper is not a problem (bug #238664).
* Tue Apr 17 2007 Tim Waugh <twaugh@redhat.com> 1.7.2-8
- Update desktop database on %%postun as well (bug #236163).