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

- Set a printer-state-reason when there's a missing required plugin (bug

Browse Source 
#531330).
This commit is contained in:
Tim Waugh 2009-10-28 17:45:28 +00:00
parent 17e0925125
commit 67dc6f0670
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hplip-plugin-error.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up hplip-3.9.8/prnt/backend/hp.c~ hplip-3.9.8/prnt/backend/hp.c
--- hplip-3.9.8/prnt/backend/hp.c~ 2009-10-28 17:03:27.435140391 +0000
+++ hplip-3.9.8/prnt/backend/hp.c 2009-10-28 17:12:15.709140073 +0000
@@ -575,7 +575,7 @@ static int loop_test(HPMUD_DEVICE dd, HP
if (first_time)
{
first_time = 0;
- old_state = ("media-empty-error,media-jam-error,"
+ old_state = ("media-empty-error,media-jam-error,hplip.plugin-error,"
"cover-open-error,toner-empty-error,other");
}
diff -up hplip-3.9.8/prnt/hpijs/hpcups.cpp~ hplip-3.9.8/prnt/hpijs/hpcups.cpp
--- hplip-3.9.8/prnt/hpijs/hpcups.cpp~ 2009-10-28 17:03:27.390139541 +0000
+++ hplip-3.9.8/prnt/hpijs/hpcups.cpp 2009-10-28 17:11:18.980140742 +0000
@@ -384,6 +384,7 @@ int HPCups::initContext (char **argv)
SendDbusMessage (device_uri, printer,
EVENT_PRINT_FAILED_MISSING_PLUGIN,
argv[2], atoi (argv[1]), argv[3]);
+ fputs ("STATE: +hplip.plugin-error\n", stderr);
BUG ("ERROR: unable to set device = %s, err = %d\n", attr->value, err);
return 1;
}

8
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.9.8 Version: 3.9.8
Release: 17%{?dist} Release: 18%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -24,6 +24,7 @@ Patch8: hplip-non-scripts.patch
Patch9: hplip-requirespageregion.patch Patch9: hplip-requirespageregion.patch
Patch10: hplip-discovery-method.patch Patch10: hplip-discovery-method.patch
Patch11: hplip-device-reconnected.patch Patch11: hplip-device-reconnected.patch
Patch12: hplip-plugin-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): /sbin/service Requires(pre): /sbin/service
@ -145,6 +146,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Give up trying to print a job to a reconnected device (bug #515481). # Give up trying to print a job to a reconnected device (bug #515481).
%patch11 -p1 -b .device-reconnected %patch11 -p1 -b .device-reconnected
%patch12 -p1 -b .plugin-error
%build %build
aclocal aclocal
@ -349,6 +351,10 @@ fi
/usr/bin/update-desktop-database &>/dev/null ||: /usr/bin/update-desktop-database &>/dev/null ||:
%changelog %changelog
* Wed Oct 28 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-18
- Set a printer-state-reason when there's a missing required plugin
(bug #531330).
* Tue Sep 29 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-17 * Tue Sep 29 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-17
- Give up trying to print a job to a reconnected device (bug #515481). - Give up trying to print a job to a reconnected device (bug #515481).