Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #6479: Create distTempDirectory in withTempEnvFile #6501

Merged
merged 1 commit into from
Jan 22, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions cabal-install/Distribution/Client/CmdExec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ import Distribution.Simple.Setup
import Distribution.Simple.Utils
( die'
, info
, createDirectoryIfMissingVerbose
, withTempDirectory
, wrapText
)
Expand Down Expand Up @@ -223,11 +224,8 @@ withTempEnvFile :: Verbosity
-> PostBuildProjectStatus
-> ([(String, Maybe String)] -> IO a)
-> IO a
withTempEnvFile verbosity
baseCtx
buildCtx
buildStatus
action =
withTempEnvFile verbosity baseCtx buildCtx buildStatus action = do
createDirectoryIfMissingVerbose verbosity True (distTempDirectory (distDirLayout baseCtx))
withTempDirectory
verbosity
(distTempDirectory (distDirLayout baseCtx))
Expand Down