rpms/hplip/F-11 hplip-retry-open.patch, NONE, 1.1 hplip.spec, 1.233, 1.234

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22447

Modified Files:
	hplip.spec 
Added Files:
	hplip-retry-open.patch 
Log Message:
* Fri Oct 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
- Retry when connecting to device fails (bug #528483).


hplip-retry-open.patch:
 hp.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE hplip-retry-open.patch ---
--- hplip-3.9.8/prnt/backend/hp.c~	2009-10-23 11:58:20.775792057 +0100
+++ hplip-3.9.8/prnt/backend/hp.c	2009-10-23 12:12:18.142792641 +0100
@@ -724,7 +724,8 @@ 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)
+                  if (stat != HPMUD_R_DEVICE_BUSY &&
+		      stat != HPMUD_R_IO_ERROR)
                   {
                      BUG("ERROR: cannot open device stat=%d: %s\n", stat, argv[0]);
                      goto bugout;


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- hplip.spec	29 Sep 2009 16:09:56 -0000	1.233
+++ hplip.spec	23 Oct 2009 11:49:39 -0000	1.234
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -25,6 +25,7 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
+Patch12: hplip-retry-open.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -147,6 +148,9 @@ 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
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -364,6 +368,9 @@ fi
 exit 0
 
 %changelog
+* Fri Oct 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
+- Retry when connecting to device fails (bug #528483).
+
 * Tue Sep 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
 - Give up trying to print a job to a reconnected device (bug #515481).