Skip to content

Fix v2-install ProgramDb confusion #6195

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.

Sign up for GitHub

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

Merged
DanielG merged 1 commit into from
Aug 22, 2019
Merged

Fix v2-install ProgramDb confusion #6195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions cabal-install/Distribution/Client/CmdInstall.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,17 +468,19 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, testFlags
hcPath = flagToMaybe projectConfigHcPath
hcPkg = flagToMaybe projectConfigHcPkg

progDb =
-- ProgramDb with directly user specified paths
preProgDb =
userSpecifyPaths (Map.toList (getMapLast packageConfigProgramPaths))
. userSpecifyArgss (Map.toList (getMapMappend packageConfigProgramArgs))
. modifyProgramSearchPath
(++ [ ProgramSearchPathDir dir
| dir <- fromNubList packageConfigProgramPathExtra ])
$ defaultProgramDb

-- progDb is a program database with compiler tools configured properly
(compiler@Compiler { compilerId =
compilerId@(CompilerId compilerFlavor compilerVersion) }, platform, progDb') <-
configCompilerEx hcFlavor hcPath hcPkg progDb verbosity
compilerId@(CompilerId compilerFlavor compilerVersion) }, platform, progDb) <-
configCompilerEx hcFlavor hcPath hcPkg preProgDb verbosity

let
globalEnv name =
Expand Down Expand Up @@ -527,7 +529,7 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, testFlags
cabalLayout = mkCabalDirLayout cabalDir mstoreDir mlogsDir
packageDbs = storePackageDBStack (cabalStoreDirLayout cabalLayout) compilerId

installedIndex <- getInstalledPackages verbosity compiler packageDbs progDb'
installedIndex <- getInstalledPackages verbosity compiler packageDbs progDb

let (envSpecs, envEntries') =
environmentFileToSpecifiers installedIndex envEntries
Expand Down