slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: drop support for directory < 1.2

Browse Source
This commit is contained in:
Simon Michael 2017-09-08 11:40:00 -07:00
parent ce83b789cf
commit 453cf431b2
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hledger/Hledger/Cli/Utils.hs
View File

@ -46,20 +46,8 @@ import Test.HUnit
import Text.Printf import Text.Printf
import Text.Regex.TDFA ((=~)) import Text.Regex.TDFA ((=~))
-- kludge - adapt to whichever directory version is installed, or when
-- cabal macros aren't available, assume the new directory
#ifdef MIN_VERSION_directory
#if MIN_VERSION_directory(1,2,0)
#define directory_1_2
#endif
#else
#define directory_1_2
#endif
#ifdef directory_1_2
import System.Time (ClockTime(TOD)) import System.Time (ClockTime(TOD))
import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds) import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)
#endif
import Hledger.Cli.CliOptions import Hledger.Cli.CliOptions
import Hledger.Data import Hledger.Data
@ -190,13 +178,9 @@ fileModificationTime :: FilePath -> IO ClockTime
fileModificationTime f fileModificationTime f
| null f = getClockTime | null f = getClockTime
| otherwise = (do | otherwise = (do
#ifdef directory_1_2
utc <- getModificationTime f utc <- getModificationTime f
let nom = utcTimeToPOSIXSeconds utc let nom = utcTimeToPOSIXSeconds utc
let clo = TOD (read $ takeWhile (`elem` "0123456789") $ show nom) 0 -- XXX read let clo = TOD (read $ takeWhile (`elem` "0123456789") $ show nom) 0 -- XXX read
#else
clo <- getModificationTime f
#endif
return clo return clo
) )
`C.catch` \(_::C.IOException) -> getClockTime `C.catch` \(_::C.IOException) -> getClockTime