diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-11 17:14:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-11 17:14:19 -0400 |
| commit | 8da8ec730dc0df29dd97be861938deeb2488dda0 (patch) | |
| tree | 58726f868af0edc0f14144e0f03788bae80ef7e5 | |
| parent | 314ec5d56de69ca6bbd0468d0f4b3b456feeb9b3 (diff) | |
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.
| -rw-r--r-- | Utility/Scheduled.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Utility/Scheduled.hs b/Utility/Scheduled.hs index 2b7cae2b6..45914aada 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 0c0bfafdb..c3952f28f 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 <joeyh@debian.org> Fri, 11 Apr 2014 17:13:07 -0400 + git-annex (5.20140411) unstable; urgency=high * importfeed: Filename template can now contain an itempubdate variable. |