From: msweet Date: Mon, 31 Aug 2015 14:27:39 +0000 (+0000) Subject: Update jobs.cache after expiring job files (STR #4706) X-Git-Tag: v2.2b1~197 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b2b24c55848bdb2fb2e92006cf28eb545f97389;p=thirdparty%2Fcups.git Update jobs.cache after expiring job files (STR #4706) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12856 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/CHANGES.txt b/CHANGES.txt index a51d09d560..ab1574c1f2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 2.1.0 - 2015-08-28 +CHANGES.txt - 2.1.0 - 2015-08-31 -------------------------------- CHANGES IN CUPS V2.1.0 @@ -12,6 +12,8 @@ CHANGES IN CUPS V2.1.0 - "make check" incorrectly reported an expectation of 18 warning messages when 8 were expected (STR #4684) - The new PDF file type rule did not work (STR #4692) + - The scheduler did not update the jobs.cache file when job files were + expired (STR #4706) - Fixed some configure script issues (STR #4694, STR #4695, STR #4698) - Documentation updates (STR #4691, STR #4693) diff --git a/INSTALL.txt b/INSTALL.txt index c9c9a98e24..bdc219c47d 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,4 +1,4 @@ -INSTALL - CUPS v2.1.0 - 2015-08-05 +INSTALL - CUPS v2.1.0 - 2015-08-31 ---------------------------------- This file describes how to compile and install CUPS from source code. For more diff --git a/README.txt b/README.txt index f8636f06f3..901e0c3d01 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README - CUPS v2.1.0 - 2015-08-05 +README - CUPS v2.1.0 - 2015-08-31 --------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" instead... diff --git a/scheduler/job.c b/scheduler/job.c index dd6d30cafb..e7c26805e5 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -442,6 +442,8 @@ cupsdCleanJobs(void) cupsdLogJob(job, CUPSD_LOG_DEBUG, "Removing document files."); remove_job_files(job); + cupsdMarkDirty(CUPSD_DIRTY_JOBS); + if (job->history_time < JobHistoryUpdate || !JobHistoryUpdate) JobHistoryUpdate = job->history_time; }