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 /Command/Log.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 'Command/Log.hs')
| -rw-r--r-- | Command/Log.hs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Command/Log.hs b/Command/Log.hs index 4bc7bb89a..671c9d674 100644 --- a/Command/Log.hs +++ b/Command/Log.hs @@ -5,15 +5,19 @@ - Licensed under the GNU GPL version 3 or higher. -} +{-# LANGUAGE CPP #-} + module Command.Log where import qualified Data.Set as S import qualified Data.Map as M import qualified Data.ByteString.Lazy.Char8 as L +import Data.Char import Data.Time.Clock.POSIX import Data.Time +#if ! MIN_VERSION_time(1,5,0) import System.Locale -import Data.Char +#endif import Common.Annex import Command @@ -172,7 +176,11 @@ parseRaw l = go $ words l parseTimeStamp :: String -> POSIXTime parseTimeStamp = utcTimeToPOSIXSeconds . fromMaybe (error "bad timestamp") . +#if MIN_VERSION_time(1,5,0) + parseTimeM True defaultTimeLocale "%s" +#else parseTime defaultTimeLocale "%s" +#endif showTimeStamp :: TimeZone -> POSIXTime -> String showTimeStamp zone = show . utcToLocalTime zone . posixSecondsToUTCTime |