mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
d8095c1e90
a/dcron-4.5-x86_64-7.txz: Rebuilt. Added init script and defaults file. Moved TMPDIR to /run/cron. Thanks to Robby Workman and shasta. a/efibootmgr-16-x86_64-1.txz: Upgraded. a/efivar-36-x86_64-1.txz: Added. a/elilo-3.16-x86_64-7.txz: Rebuilt. a/glibc-solibs-2.27-x86_64-4.txz: Rebuilt. Don't restart init in the install script, let rc.6 handle it. a/haveged-1.9.2-x86_64-1.txz: Added. a/pkgtools-15.0-noarch-18.txz: Rebuilt. setup.services: add support for rc.atd and rc.crond a/sysvinit-scripts-2.1-noarch-10.txz: Rebuilt. rc.6: restart init when shutting down - this prevents it from holding file handles to removed/upgraded versions of the glibc shared libraries which would interfere with shutdown. rc.K: use full path to telinit rc.M: start rc.atd and rc.crond rc.M: don't remove cron tempfiles (moved to /run/cron) rc.S: start rc.haveged ap/at-3.1.20-x86_64-3.txz: Rebuilt. Added init script and defaults file. l/glibc-2.27-x86_64-4.txz: Rebuilt. Don't restart init in the install script, let rc.6 handle it. l/glibc-i18n-2.27-x86_64-4.txz: Rebuilt. l/glibc-profile-2.27-x86_64-4.txz: Rebuilt. l/gnu-efi-3.0.8-x86_64-1.txz: Upgraded.
35 lines
899 B
Diff
35 lines
899 B
Diff
From 65d2649a7c8b72561eefcec239f97e7fd386114e Mon Sep 17 00:00:00 2001
|
|
From: Corey Theiss <corey.theiss@maclaren.com>
|
|
Date: Mon, 24 Mar 2014 16:25:31 -0400
|
|
Subject: [PATCH 6/9] Fixed a bug whereby syncs killed all waiting jobs.
|
|
|
|
---
|
|
database.c | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/database.c b/database.c
|
|
index dd971ce..02c5c92 100644
|
|
--- a/database.c
|
|
+++ b/database.c
|
|
@@ -1232,8 +1232,17 @@ CheckJobs(void)
|
|
}
|
|
}
|
|
}
|
|
+ nStillRunning += file->cf_Running;
|
|
+ }
|
|
+ /* For the purposes of this check, increase the "still running" counter if a file has lines that are waiting */
|
|
+ if (file->cf_Running == 0) {
|
|
+ for (line = file->cf_LineBase; line; line = line->cl_Next) {
|
|
+ if (line->cl_Pid == -2) {
|
|
+ nStillRunning += 1;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
}
|
|
- nStillRunning += file->cf_Running;
|
|
}
|
|
return(nStillRunning);
|
|
}
|
|
--
|
|
2.13.2
|
|
|