rpms/hplip/devel hplip-retry-open.patch, 1.2, 1.3 hplip.spec, 1.251, 1.252

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13725

Modified Files:
	hplip.spec 
Added Files:
	hplip-retry-open.patch 
Log Message:
* Tue Jan  5 2010 Tim Waugh <twaugh at redhat.com> - 3.9.12-2
- Retry when connecting to device fails (bug #532112).


hplip-retry-open.patch:
 hp.c |    6 ------
 1 file changed, 6 deletions(-)

Index: hplip-retry-open.patch
===================================================================
RCS file: hplip-retry-open.patch
diff -N hplip-retry-open.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip-retry-open.patch	5 Jan 2010 15:23:24 -0000	1.3
@@ -0,0 +1,16 @@
+diff -up hplip-3.9.12/prnt/backend/hp.c.retry-open hplip-3.9.12/prnt/backend/hp.c
+--- hplip-3.9.12/prnt/backend/hp.c.retry-open	2010-01-05 15:14:30.000000000 +0000
++++ hplip-3.9.12/prnt/backend/hp.c	2010-01-05 15:16:03.521911780 +0000
+@@ -741,12 +741,6 @@ int main(int argc, char *argv[])
+                      goto bugout;
+                   }
+ 
+-                  if (stat != HPMUD_R_DEVICE_BUSY)
+-                  {
+-                     BUG("ERROR: open device failed stat=%d: %s\n", stat, argv[0]);
+-                     goto bugout;
+-                  }
+-
+                   /* Display user error. */
+                   device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]);
+ 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -r1.251 -r1.252
--- hplip.spec	5 Jan 2010 13:24:42 -0000	1.251
+++ hplip.spec	5 Jan 2010 15:23:24 -0000	1.252
@@ -16,6 +16,7 @@ Source0: http://kent.dl.sourceforge.net/
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
+Patch8: hplip-retry-open.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch14: hplip-hpcups-sigpipe.patch
@@ -117,6 +118,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Make sure to avoid handwritten asm.
 %patch4 -p1 -b .no-asm
 
+# Retry when connecting to device fails (bug #532112).
+%patch8 -p1 -b .retry-open
+
 # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 %patch10 -p1 -b .discovery-method
 
@@ -336,6 +340,7 @@ fi
 
 %changelog
 * Tue Jan  5 2010 Tim Waugh <twaugh at redhat.com> - 3.9.12-2
+- Retry when connecting to device fails (bug #532112).
 - Don't ship PolicyKit mechanism (bug #551773).
 
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 3.9.12-1