diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-09 21:02:38 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-09 21:02:38 -0400 |
| commit | af27920956c9ef59052662389bff1ba40efd1ea0 (patch) | |
| tree | ab518f4fab63076cb6f967ef2738e6431912e3d8 | |
| parent | ac78243ac1d1a832ee81ccc354e4e4bdda4a29e7 (diff) | |
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.
| -rw-r--r-- | Logs/Activity.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Logs/Activity.hs b/Logs/Activity.hs index 45262a633..9738fdb1c 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 0958e7dc5..cc7e1fa20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |