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

- Retry when connecting to device fails (bug #532112).

Browse Source
This commit is contained in:
Tim Waugh 2010-01-05 15:23:24 +00:00
parent c2455013a2
commit 5b1c370564
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hplip-retry-open.patch Normal file
View File

@ -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]);

5
hplip.spec
View File

@ -16,6 +16,7 @@ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar
Patch2: hplip-strstr-const.patch Patch2: hplip-strstr-const.patch
Patch3: hplip-ui-optional.patch Patch3: hplip-ui-optional.patch
Patch4: hplip-no-asm.patch Patch4: hplip-no-asm.patch
Patch8: hplip-retry-open.patch
Patch10: hplip-discovery-method.patch Patch10: hplip-discovery-method.patch
Patch11: hplip-device-reconnected.patch Patch11: hplip-device-reconnected.patch
Patch14: hplip-hpcups-sigpipe.patch Patch14: hplip-hpcups-sigpipe.patch
@ -117,6 +118,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Make sure to avoid handwritten asm. # Make sure to avoid handwritten asm.
%patch4 -p1 -b .no-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). # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
%patch10 -p1 -b .discovery-method %patch10 -p1 -b .discovery-method
@ -336,6 +340,7 @@ fi
%changelog %changelog
* Tue Jan 5 2010 Tim Waugh <twaugh@redhat.com> - 3.9.12-2 * Tue Jan 5 2010 Tim Waugh <twaugh@redhat.com> - 3.9.12-2
- Retry when connecting to device fails (bug #532112).
- Don't ship PolicyKit mechanism (bug #551773). - Don't ship PolicyKit mechanism (bug #551773).
* Tue Dec 22 2009 Tim Waugh <twaugh@redhat.com> - 3.9.12-1 * Tue Dec 22 2009 Tim Waugh <twaugh@redhat.com> - 3.9.12-1