From f3d8ceb6855af4b1e819c33e2ae5a4fa636070f7 Mon Sep 17 00:00:00 2001 From: msweet Date: Wed, 13 Jan 2016 19:13:49 +0000 Subject: [PATCH] The "lp -H resume" command did not reset the "job-state-reasons" attribute value (STR #4752) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13046 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES-2.1.txt | 2 ++ scheduler/job.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt index 060ba1869c..2cbdd7e0c0 100644 --- a/CHANGES-2.1.txt +++ b/CHANGES-2.1.txt @@ -13,6 +13,8 @@ CHANGES IN CUPS V2.1.3 (STR #4754) - Fixed some issues in ipptool for skipped tests () + - The "lp -H resume" command did not reset the "job-state-reasons" + attribute value (STR #4752) CHANGES IN CUPS V2.1.2 diff --git a/scheduler/job.c b/scheduler/job.c index e7c26805e5..36719d89a5 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -2316,7 +2316,10 @@ cupsdSetJobHoldUntil(cupsd_job_t *job, /* I - Job */ } - ippSetString(job->attrs, &job->reasons, 0, "job-hold-until-specified"); + if (strcmp(when, "no-hold")) + ippSetString(job->attrs, &job->reasons, 0, "job-hold-until-specified"); + else + ippSetString(job->attrs, &job->reasons, 0, "none"); /* * Update the hold time... -- 2.47.2