hasufell
/
ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pkgConf is a directory.

This commit is contained in:
Kazu Yamamoto 2013-03-07 20:50:04 +09:00
parent 0fa81bc26d
commit 1a792c4943
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cradle.hs
View File

@ -40,7 +40,7 @@ findCradle Nothing strver = do
Just (cdir,cfile) -> do Just (cdir,cfile) -> do
let sbox = cdir </> "cabal-dev/" let sbox = cdir </> "cabal-dev/"
pkgConf = packageConfName sbox strver pkgConf = packageConfName sbox strver
exist <- doesFileExist pkgConf exist <- doesDirectoryExist pkgConf
return Cradle { return Cradle {
cradleCurrentDir = wdir cradleCurrentDir = wdir
, cradleCabalDir = Just cdir , cradleCabalDir = Just cdir
@ -66,7 +66,7 @@ packageConfName path ver = path </> "packages-" ++ ver ++ ".conf"
checkPackageConf :: FilePath -> String -> IO FilePath checkPackageConf :: FilePath -> String -> IO FilePath
checkPackageConf path ver = do checkPackageConf path ver = do
let conf = packageConfName path ver let conf = packageConfName path ver
exist <- doesFileExist conf exist <- doesDirectoryExist conf
if exist then if exist then
return conf return conf
else else

1
test/data/cabal-dev/packages-7.6.2.conf
View File

@ -1 +0,0 @@
dummy