haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1219 from bermanjosh/yesod-keter-no-stack

Browse Source 
error handling when checking for stack binary
This commit is contained in:
Michael Snoyman 2016-04-20 20:11:27 +03:00
commit 0761cd7087
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-bin/Keter.hs
View File

@ -79,8 +79,8 @@ keter cabal noBuild noCopyTo buildArgs = do
unless noBuild $ do unless noBuild $ do
stackQueryRunSuccess <- do stackQueryRunSuccess <- do
(ec,_,_) <- readProcessWithExitCode "stack" ["query"] "" eres <- try $ readProcessWithExitCode "stack" ["query"] "" :: IO (Either IOException (ExitCode, String, String))
return (ec == ExitSuccess) return $ either (\_ -> False) (\(ec, _, _) -> (ec == ExitSuccess)) eres
let inStackExec = isJust $ lookup "STACK_EXE" env' let inStackExec = isJust $ lookup "STACK_EXE" env'
mStackYaml = lookup "STACK_YAML" env' mStackYaml = lookup "STACK_YAML" env'

2
yesod-bin/yesod-bin.cabal
View File

@ -1,5 +1,5 @@
name: yesod-bin name: yesod-bin
version: 1.4.18 version: 1.4.18.1
license: MIT license: MIT
license-file: LICENSE license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com> author: Michael Snoyman <michael@snoyman.com>