From 9e16171c7f9896567bc2b916c6b75949d1534e47 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 11 Apr 2014 17:14:19 -0400 Subject: [PATCH] Last release didn't quite fix the high cpu issue in all cases, this should. This is supposed to look for a day past the last day it ran, not a month past. Seems to work, at least in anarcat's test case. --- Utility/Scheduled.hs | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Utility/Scheduled.hs b/Utility/Scheduled.hs index 2b7cae2b65..45914aadad 100644 --- a/Utility/Scheduled.hs +++ b/Utility/Scheduled.hs @@ -121,7 +121,7 @@ calcNextTime (Schedule recurrance scheduledtime) lasttime currenttime | otherwise -> skip 1 Monthly Nothing | afterday -> skip 1 - | maybe True (\old -> mnum candidate > mnum old && mday candidate >= (mday old `mod` minmday)) lastday -> + | maybe True (\old -> mday candidate > mday old && mday candidate >= (mday old `mod` minmday)) lastday -> -- Window only covers current month, -- in case there is a Divisible requirement. Just $ window candidate (endOfMonth candidate) diff --git a/debian/changelog b/debian/changelog index 0c0bfafdba..c3952f28f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (5.20140412) UNRELEASED; urgency=high + + * Last release didn't quite fix the high cpu issue in all cases, this should. + + -- Joey Hess Fri, 11 Apr 2014 17:13:07 -0400 + git-annex (5.20140411) unstable; urgency=high * importfeed: Filename template can now contain an itempubdate variable.