Fix activity log parsing.

I had some cargo culting in there that used the wrong type, so it failed
to parse old logs, and overwrote them with the new log.
This commit is contained in:
Joey Hess 2015-04-09 21:02:38 -04:00
parent 6387281cc8
commit 06211738c1
2 changed files with 7 additions and 1 deletions

View file

@ -26,7 +26,7 @@ recordActivity :: Activity -> UUID -> Annex ()
recordActivity act uuid = do
ts <- liftIO getPOSIXTime
Annex.Branch.change activityLog $
showLog id . changeLog ts uuid (show act) . parseLog readish
showLog show . changeLog ts uuid act . parseLog readish
lastActivities :: Maybe Activity -> Annex (Log Activity)
lastActivities wantact = parseLog onlywanted <$> Annex.Branch.get activityLog

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (5.20150410) UNRELEASED; urgency=medium
* Fix activity log parsing.
-- Joey Hess <id@joeyh.name> Thu, 09 Apr 2015 20:59:43 -0400
git-annex (5.20150409) unstable; urgency=medium
* This fixes a bug in the assistant introduced by the literal pathspec