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

Disable 'cabal' cradle when executable isn't found

Browse Source
This commit is contained in:
Daniel Gröber 2016-05-11 15:10:00 +02:00
parent ab3dccc77c
commit 3ae9204b95
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Language/Haskell/GhcMod/Cradle.hs
View File

@ -69,12 +69,16 @@ fillTempDir crdl = do
tmpDir <- liftIO $ newTempDir (cradleRootDir crdl) tmpDir <- liftIO $ newTempDir (cradleRootDir crdl)
return crdl { cradleTempDir = tmpDir } return crdl { cradleTempDir = tmpDir }
cabalCradle :: IOish m => FilePath -> MaybeT m Cradle cabalCradle :: (IOish m, GmLog m, GmOut m) => FilePath -> MaybeT m Cradle
cabalCradle wdir = do cabalCradle wdir = do
cabalFile <- MaybeT $ liftIO $ findCabalFile wdir cabalFile <- MaybeT $ liftIO $ findCabalFile wdir
let cabalDir = takeDirectory cabalFile let cabalDir = takeDirectory cabalFile
-- If cabal doesn't exist the user probably wants to use something else
whenM (isJust <$> liftIO (findExecutable "cabal")) $ do
gmLog GmWarning "" $ text "'dist/setup-config' exists but 'cabal' executable wasn't found."
mzero
return Cradle { return Cradle {
cradleProject = CabalProject cradleProject = CabalProject
, cradleCurrentDir = wdir , cradleCurrentDir = wdir