2006715 - Trying to restart and hold a job doesn't work

This commit is contained in:
Zdenek Dohnal 2021-11-03 14:45:08 +01:00
parent 950ed1e802
commit fc32155788
2 changed files with 25 additions and 0 deletions

View File

@ -0,0 +1,20 @@
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index e0dbc4a..5e9a985 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -9891,11 +9891,10 @@ restart_job(cupsd_client_t *con, /* I - Client connection */
cupsdLogJob(job, CUPSD_LOG_DEBUG,
"Restarted by \"%s\" with job-hold-until=%s.",
username, attr->values[0].string.text);
- cupsdSetJobHoldUntil(job, attr->values[0].string.text, 0);
-
- cupsdAddEvent(CUPSD_EVENT_JOB_CONFIG_CHANGED | CUPSD_EVENT_JOB_STATE,
- NULL, job, "Job restarted by user with job-hold-until=%s",
- attr->values[0].string.text);
+ cupsdSetJobHoldUntil(job, attr->values[0].string.text, 1);
+ cupsdSetJobState(job, IPP_JOB_HELD, CUPSD_JOB_DEFAULT,
+ "Job restarted by user with job-hold-until=%s",
+ attr->values[0].string.text);
}
else
{

View File

@ -89,6 +89,8 @@ Patch19: cups-cleanfiles.patch
Patch20: 0001-cgi-bin-ipp-var.c-Use-guest-user-for-Move-Job-when-n.patch
# 1999957 - Printing of banner before PCL file only prints banner
Patch21: 0001-scheduler-job.c-use-gziptoany-for-raw-files-not-just.patch
# 2006715 - Trying to restart and hold a job doesn't work
Patch22: cups-restart-job-hold-until.patch
##### Patches removed because IMHO they aren't no longer needed
##### but still I'll leave them in git in case their removal
@ -306,6 +308,8 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
%patch20 -p1 -b .move-job
# 1999957 - Printing of banner before PCL file only prints banner
%patch21 -p1 -b .banner-rawfile
# 2006715 - Trying to restart and hold a job doesn't work
%patch22 -p1 -b .restart-hold-job
%if %{lspp}
@ -658,6 +662,7 @@ rm -f %{cups_serverbin}/backend/smb
* Wed Nov 03 2021 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3op2-9
- 2018950 - Unauthenticated users can't move print jobs in Web UI
- 1999957 - Printing of banner before PCL file only prints banner
- 2006715 - Trying to restart and hold a job doesn't work
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.3op2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild