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

Changed to use IO Exceptions

Browse Source
This commit is contained in:
James Hobson 2022-01-12 13:31:10 +01:00
parent 5d43168370
commit 3fd9fae66a
No known key found for this signature in database
GPG Key ID: F26F0E100770F597
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/GHCup/Utils.hs
View File

@ -888,17 +888,18 @@ applyPatches :: (MonadReader env m, HasDirs env, HasLog env, MonadIO m)
-> FilePath -- ^ dir to apply patches in
-> Excepts '[PatchFailed] m ()
applyPatches pdir ddir = do
seriesExists <- liftIO (doesFileExist (pdir </> "series"))
patches <- if seriesExists
then
liftIO $ map (pdir </>) . lines <$> readFile (pdir </> "series")
else
(fmap . fmap) (pdir </>) $ liftIO $ sort <$> findFiles
let lexicographical = (fmap . fmap) (pdir </>) $ sort <$> findFiles
pdir
(makeRegexOpts compExtended
execBlank
([s|.+\.(patch|diff)$|] :: ByteString)
)
let quilt = map (pdir </>) . lines <$> readFile (pdir </> "series")
patches <- liftIO $ quilt `catchIO` (\e ->
if isDoesNotExistError e || isPermissionError e then
lexicographical
else throwIO e)
forM_ patches $ \patch' -> applyPatch patch' ddir