rpms/cups/devel cups-str3292.patch,1.1,1.2 cups.spec,1.506,1.507
Tim Waugh
twaugh at fedoraproject.org
Wed Aug 26 16:41:14 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25163
Modified Files:
cups-str3292.patch cups.spec
Log Message:
* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
- Fixed buggy JobKillDelay handling fix (STR #3292).
cups-str3292.patch:
job.c | 14 +++++++++-----
main.c | 7 +++++++
2 files changed, 16 insertions(+), 5 deletions(-)
Index: cups-str3292.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3292.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3292.patch 19 Aug 2009 14:07:05 -0000 1.1
+++ cups-str3292.patch 26 Aug 2009 16:41:13 -0000 1.2
@@ -1,23 +1,25 @@
-diff -up cups-1.4rc1/scheduler/job.c.cancel-job cups-1.4rc1/scheduler/job.c
---- cups-1.4rc1/scheduler/job.c.cancel-job 2009-08-19 14:48:55.733825903 +0100
-+++ cups-1.4rc1/scheduler/job.c 2009-08-19 14:49:01.813826101 +0100
-@@ -2359,19 +2359,21 @@ cupsdSetJobState(
+diff -up cups-1.4rc1/scheduler/job.c.str3292 cups-1.4rc1/scheduler/job.c
+--- cups-1.4rc1/scheduler/job.c.str3292 2009-08-26 17:01:19.442314736 +0100
++++ cups-1.4rc1/scheduler/job.c 2009-08-26 17:03:51.993190253 +0100
+@@ -2359,19 +2359,23 @@ cupsdSetJobState(
break;
case IPP_JOB_ABORTED :
- case IPP_JOB_CANCELED :
case IPP_JOB_COMPLETED :
++ case IPP_JOB_CANCELED :
/*
- * Expire job subscriptions since the job is now "completed"...
-+ * Remove the job from the active list...
++ * Remove the job from the active list if there are no
++ * processes still running for it...
*/
- cupsdExpireSubscriptions(NULL, job);
-+ cupsArrayRemove(ActiveJobs, job);
-+
-+ /* fall through... */
++ for (i = 0; job->filters[i] < 0; i++);
++ if (newstate != IPP_JOB_CANCELED ||
++ (!job->filters[i] && job->backend <= 0))
++ cupsArrayRemove(ActiveJobs, job);
-+ case IPP_JOB_CANCELED :
/*
- * Remove the job from the active list...
+ * Expire job subscriptions since the job is now "completed"...
@@ -28,9 +30,9 @@ diff -up cups-1.4rc1/scheduler/job.c.can
#ifdef __APPLE__
/*
-diff -up cups-1.4rc1/scheduler/main.c.cancel-job cups-1.4rc1/scheduler/main.c
---- cups-1.4rc1/scheduler/main.c.cancel-job 2009-08-19 14:48:55.451701014 +0100
-+++ cups-1.4rc1/scheduler/main.c 2009-08-19 14:49:01.817825841 +0100
+diff -up cups-1.4rc1/scheduler/main.c.str3292 cups-1.4rc1/scheduler/main.c
+--- cups-1.4rc1/scheduler/main.c.str3292 2009-08-26 17:01:19.084319753 +0100
++++ cups-1.4rc1/scheduler/main.c 2009-08-26 17:03:52.005190304 +0100
@@ -1803,6 +1803,13 @@ process_children(void)
cupsdContinueJob(job);
}
@@ -39,7 +41,7 @@ diff -up cups-1.4rc1/scheduler/main.c.ca
+ {
+ for (i = 0; job->filters[i] < 0; i++);
+
-+ if (!job->filters[i] && job->backend < 0)
++ if (!job->filters[i] && job->backend <= 0)
+ cupsArrayRemove(ActiveJobs, job);
+ }
}
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -p -r1.506 -r1.507
--- cups.spec 21 Aug 2009 14:50:22 -0000 1.506
+++ cups.spec 26 Aug 2009 16:41:14 -0000 1.507
@@ -532,7 +532,8 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
-* Fri Aug 21 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+* Wed Aug 26 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.18
+- Fixed buggy JobKillDelay handling fix (STR #3292).
- Prevent infinite loop in ppdc (STR #3293).
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:1.4-0.rc1.17.1
More information about the scm-commits
mailing list