Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
8f2480ae
Commit
8f2480ae
authored
Jun 26, 2018
by
Alexis Williams
Browse files
Make new-update work outside of project dirs (fix #5096)
parent
2ce48588
Changes
1
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/CmdUpdate.hs
View file @
8f2480ae
...
...
@@ -13,7 +13,10 @@ import Distribution.Client.Compat.Directory
import
Distribution.Client.ProjectOrchestration
import
Distribution.Client.ProjectConfig
(
ProjectConfig
(
..
)
,
projectConfigWithSolverRepoContext
)
,
ProjectConfigShared
(
projectConfigProjectFile
,
projectConfigConfigFile
)
,
ProjectRoot
(
ProjectRootExplicit
)
,
projectConfigWithSolverRepoContext
,
findProjectRoot
,
readGlobalConfig
)
import
Distribution.Client.Types
(
Repo
(
..
),
RemoteRepo
(
..
),
isRepoRemote
)
import
Distribution.Client.HttpUtils
...
...
@@ -27,7 +30,7 @@ import Distribution.Client.Setup
,
UpdateFlags
,
defaultUpdateFlags
,
RepoContext
(
..
)
)
import
Distribution.Simple.Setup
(
HaddockFlags
,
fromFlagOrDefault
)
(
HaddockFlags
,
fromFlagOrDefault
,
flagToMaybe
)
import
Distribution.Simple.Utils
(
die'
,
notice
,
wrapText
,
writeFileAtomic
,
noticeNoWrap
,
intercalate
)
import
Distribution.Verbosity
...
...
@@ -38,6 +41,8 @@ import Distribution.Client.IndexUtils
,
currentIndexTimestamp
,
indexBaseName
)
import
Distribution.Text
(
Text
(
..
),
display
,
simpleParse
)
import
Distribution.Client.RebuildMonad
(
runRebuild
)
import
Data.Maybe
(
fromJust
)
import
qualified
Distribution.Compat.ReadP
as
ReadP
...
...
@@ -109,10 +114,16 @@ updateAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
->
[
String
]
->
GlobalFlags
->
IO
()
updateAction
(
configFlags
,
configExFlags
,
installFlags
,
haddockFlags
)
extraArgs
globalFlags
=
do
ProjectBaseContext
{
projectConfig
}
<-
establishProjectBaseContext
verbosity
cliConfig
let
mprojectFile
=
flagToMaybe
(
projectConfigProjectFile
.
projectConfigShared
$
cliConfig
)
eprojectRoot
<-
findProjectRoot
Nothing
mprojectFile
projectConfig
<-
case
eprojectRoot
of
Right
(
ProjectRootExplicit
_root
_config
)
->
projectConfig
<$>
establishProjectBaseContext
verbosity
cliConfig
_
->
do
let
globalConfigFlag
=
projectConfigConfigFile
(
projectConfigShared
cliConfig
)
globalConfig
<-
runRebuild
""
$
readGlobalConfig
verbosity
globalConfigFlag
return
(
globalConfig
<>
cliConfig
)
projectConfigWithSolverRepoContext
verbosity
(
projectConfigShared
projectConfig
)
(
projectConfigBuildOnly
projectConfig
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment