diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /Logs/Transitions.hs | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'Logs/Transitions.hs')
| -rw-r--r-- | Logs/Transitions.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Logs/Transitions.hs b/Logs/Transitions.hs index d782455a6..5ccfd7e8c 100644 --- a/Logs/Transitions.hs +++ b/Logs/Transitions.hs @@ -15,11 +15,10 @@ module Logs.Transitions where import Data.Time.Clock.POSIX -import Data.Time -import System.Locale import qualified Data.Set as S import Common.Annex +import Logs.TimeStamp transitionsLog :: FilePath transitionsLog = "transitions.log" @@ -66,12 +65,13 @@ showTransitionLine :: TransitionLine -> String showTransitionLine (TransitionLine ts t) = unwords [show t, show ts] parseTransitionLine :: String -> Maybe TransitionLine -parseTransitionLine s = TransitionLine <$> pdate ds <*> readish ts +parseTransitionLine s = TransitionLine + <$> parsePOSIXTime ds + <*> readish ts where ws = words s ts = Prelude.head ws ds = unwords $ Prelude.tail ws - pdate = utcTimeToPOSIXSeconds <$$> parseTime defaultTimeLocale "%s%Qs" combineTransitions :: [Transitions] -> Transitions combineTransitions = S.unions |