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

Revert "implements isolated install sanity-checking for Cabal installs" 

This reverts commit 300cfd3ba6.
This commit is contained in:
Arjun Kathuria 2021-08-11 09:46:42 +05:30
parent 300cfd3ba6
commit dcfb3afdad
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/ghcup/BrickMain.hs
View File

@ -442,7 +442,6 @@ install' _ (_, ListResult {..}) = do
, DownloadFailed , DownloadFailed
, NoUpdate , NoUpdate
, TarDirDoesNotExist , TarDirDoesNotExist
, IsolatedDirNotEmpty
] ]
run (do run (do

1
app/ghcup/Main.hs
View File

@ -1478,7 +1478,6 @@ Report bugs at <https://gitlab.haskell.org/haskell/ghcup-hs/issues>|]
, TarDirDoesNotExist , TarDirDoesNotExist
, NextVerNotFound , NextVerNotFound
, NoToolVersionSet , NoToolVersionSet
, IsolatedDirNotEmpty
] ]
let runInstTool mInstPlatform action' = do let runInstTool mInstPlatform action' = do

5
lib/GHCup.hs
View File

@ -405,7 +405,6 @@ installCabalBindist :: ( MonadMask m
#if !defined(TAR) #if !defined(TAR)
, ArchiveResult , ArchiveResult
#endif #endif
, IsolatedDirNotEmpty
] ]
m m
() ()
@ -426,8 +425,7 @@ installCabalBindist dlinfo ver isoFilepath = do
) )
(throwE $ AlreadyInstalled Cabal ver) (throwE $ AlreadyInstalled Cabal ver)
Just isoDir -> _ -> pure () -- check isn't required in isolated installs
liftE $ isolatedInstallSanityCheck isoDir
-- download (or use cached version) -- download (or use cached version)
dl <- liftE $ downloadCached dlinfo Nothing dl <- liftE $ downloadCached dlinfo Nothing
@ -500,7 +498,6 @@ installCabalBin :: ( MonadMask m
#if !defined(TAR) #if !defined(TAR)
, ArchiveResult , ArchiveResult
#endif #endif
, IsolatedDirNotEmpty
] ]
m m
() ()