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

diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt
index 060ba1869c9c2baae2d581473597f6574711451e..2cbdd7e0c0430cc999ffc909dab70d1738aff3b6 100644 (file)
--- 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
          (<rdar://problem/24137160>)
+       - 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 e7c26805e55e40f699d686f94fc462bd031493df..36719d89a50e3bb2b7c6391f0bde9941a76471af 100644 (file)
--- 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...