@@ -256,10 +256,8 @@ import Distribution.Version
256
256
257
257
import Control.Exception (AssertionFailed , assert , try )
258
258
import Data.Monoid (Any (.. ))
259
- import System.Directory
260
- ( doesFileExist
261
- , withCurrentDirectory
262
- )
259
+ import Data.Traversable (mapM )
260
+ import qualified System.Directory as Directory
263
261
import System.Environment (getEnvironment , getExecutablePath , getProgName )
264
262
import System.FilePath
265
263
( dropExtension
@@ -401,7 +399,7 @@ mainWorker args = do
401
399
++ " "
402
400
++ configFile
403
401
++ " \n "
404
- exists <- doesFileExist configFile
402
+ exists <- Directory. doesFileExist configFile
405
403
unless exists $
406
404
putStrLn $
407
405
" This file will be generated with sensible "
@@ -1146,13 +1144,14 @@ listAction :: ListFlags -> [String] -> Action
1146
1144
listAction listFlags extraArgs globalFlags = do
1147
1145
let verbosity = fromFlag (listVerbosity listFlags)
1148
1146
config <- loadConfigOrSandboxConfig verbosity globalFlags
1147
+ canonicalizedHcPath <- mapM Directory. canonicalizePath (listHcPath listFlags)
1149
1148
let configFlags' = savedConfigureFlags config
1150
1149
configFlags =
1151
1150
configFlags'
1152
1151
{ configPackageDBs =
1153
1152
configPackageDBs configFlags'
1154
1153
`mappend` listPackageDBs listFlags
1155
- , configHcPath = listHcPath listFlags
1154
+ , configHcPath = canonicalizedHcPath
1156
1155
}
1157
1156
globalFlags' = savedGlobalFlags config `mappend` globalFlags
1158
1157
compProgdb <-
@@ -1305,7 +1304,7 @@ uploadAction uploadFlags extraArgs globalFlags = do
1305
1304
| otherwise =
1306
1305
sequence_
1307
1306
[ do
1308
- exists <- doesFileExist tarfile
1307
+ exists <- Directory. doesFileExist tarfile
1309
1308
unless exists $ dieWithException verbosity $ FileNotFound tarfile
1310
1309
| tarfile <- tarfiles
1311
1310
]
@@ -1418,7 +1417,7 @@ initAction initFlags extraArgs globalFlags = do
1418
1417
[] -> initAction'
1419
1418
[projectDir] -> do
1420
1419
createDirectoryIfMissingVerbose verbosity True projectDir
1421
- withCurrentDirectory projectDir initAction'
1420
+ Directory. withCurrentDirectory projectDir initAction'
1422
1421
_ -> dieWithException verbosity InitAction
1423
1422
where
1424
1423
initAction' = do
@@ -1450,7 +1449,7 @@ userConfigAction ucflags extraArgs globalFlags = do
1450
1449
case extraArgs of
1451
1450
(" init" : _) -> do
1452
1451
path <- configFile
1453
- fileExists <- doesFileExist path
1452
+ fileExists <- Directory. doesFileExist path
1454
1453
if (not fileExists || (fileExists && frc))
1455
1454
then void $ createDefaultConfigFile verbosity extraLines path
1456
1455
else dieWithException verbosity $ UserConfigAction path
0 commit comments