From 06211738c12ed371d64e3f4d5bd41b42826626e3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Apr 2015 21:02:38 -0400 Subject: [PATCH] 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. --- Logs/Activity.hs | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Logs/Activity.hs b/Logs/Activity.hs index 45262a6337..9738fdb1c0 100644 --- a/Logs/Activity.hs +++ b/Logs/Activity.hs @@ -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 diff --git a/debian/changelog b/debian/changelog index 0958e7dc55..cc7e1fa20d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (5.20150410) UNRELEASED; urgency=medium + + * Fix activity log parsing. + + -- Joey Hess 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