diff --git a/hplip-retry-open.patch b/hplip-retry-open.patch deleted file mode 100644 index 75723e7..0000000 --- a/hplip-retry-open.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up hplip-3.9.8/prnt/backend/hp.c.retry-open hplip-3.9.8/prnt/backend/hp.c ---- hplip-3.9.8/prnt/backend/hp.c.retry-open 2009-10-27 11:46:00.181457688 +0000 -+++ hplip-3.9.8/prnt/backend/hp.c 2009-10-27 11:57:51.527583553 +0000 -@@ -724,11 +724,21 @@ int main(int argc, char *argv[]) - /* Open hp device. */ - while ((stat = hpmud_open_device(argv[0], ma.prt_mode, &hd)) != HPMUD_R_OK) - { -- if (stat != HPMUD_R_DEVICE_BUSY) -- { -- BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]); -- goto bugout; -- } -+ if (getenv ("CLASS") != NULL) -+ { -+ /* If the CLASS environment variable is set we -+ * need to give other class members a chance in -+ * case their devices are ready to go. -+ */ -+ -+ BUG("INFO: cannot open device stat=%d: %s\n", stat, argv[0]); -+ BUG("INFO: queuing on next printer in class...\n"); -+ -+ /* Prevent job requeuing too quickly. */ -+ sleep (5); -+ -+ goto bugout; -+ } - - /* Display user error. */ - device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]); diff --git a/hplip.spec b/hplip.spec index c5e530d..98f1f37 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -24,7 +24,6 @@ Patch8: hplip-non-scripts.patch Patch9: hplip-requirespageregion.patch Patch10: hplip-discovery-method.patch Patch11: hplip-device-reconnected.patch -Patch12: hplip-retry-open.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -149,9 +148,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Give up trying to print a job to a reconnected device (bug #515481). %patch11 -p1 -b .device-reconnected -# Retry when connecting to device fails (bug #528483). -%patch12 -p1 -b .retry-open - # Set a printer-state-reason when there's a missing required plugin # (bug #531330). %patch13 -p1 -b .plugin-error @@ -362,6 +358,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Fri Oct 30 2009 Tim Waugh 3.9.8-20 +- Reverted retry patch until it can be tested some more. + * Thu Oct 29 2009 Tim Waugh 3.9.8-19 - Retry when connecting to device fails (bug #528483). - Avoid busy loop in hpcups when backend has exited (bug #525944).