hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ghc-make when files are in PATH

Browse Source 
Fixes #11
This commit is contained in:
Julian Ospald 2020-04-16 23:09:04 +02:00
parent fd7807a66e
commit 793aad7b6c
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/GHCup/Utils/File.hs
View File

@ -371,8 +371,7 @@ searchPath paths needle = go paths
where where
go [] = pure Nothing go [] = pure Nothing
go (x : xs) = go (x : xs) =
hideErrorDefM PermissionDenied (go xs) hideErrorDefM [InappropriateType, PermissionDenied, NoSuchThing] (go xs)
$ hideErrorDefM NoSuchThing (go xs)
$ do $ do
dirStream <- openDirStream (toFilePath x) dirStream <- openDirStream (toFilePath x)
S.findM (\(_, p) -> isMatch x p) (dirContentsStream dirStream) S.findM (\(_, p) -> isMatch x p) (dirContentsStream dirStream)

12
lib/GHCup/Utils/Prelude.hs
View File

@ -168,14 +168,14 @@ liftIOException errType ex =
. lift . lift
hideErrorDef :: IOErrorType -> a -> IO a -> IO a hideErrorDef :: [IOErrorType] -> a -> IO a -> IO a
hideErrorDef err def = hideErrorDef errs def =
handleIO (\e -> if err == ioeGetErrorType e then pure def else ioError e) handleIO (\e -> if ioeGetErrorType e `elem` errs then pure def else ioError e)
hideErrorDefM :: IOErrorType -> IO a -> IO a -> IO a hideErrorDefM :: [IOErrorType] -> IO a -> IO a -> IO a
hideErrorDefM err def = hideErrorDefM errs def =
handleIO (\e -> if err == ioeGetErrorType e then def else ioError e) handleIO (\e -> if ioeGetErrorType e `elem` errs then def else ioError e)
-- TODO: does this work? -- TODO: does this work?