Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
Cabal
Commits
121c9de9
Commit
121c9de9
authored
10 years ago
by
Mikhail Glushenkov
Browse files
Options
Downloads
Patches
Plain Diff
list, update, info, init: ignore 'require-sandbox'.
Fixes #2309, #1889.
parent
053b9893
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cabal-install/Main.hs
+13
-5
13 additions, 5 deletions
cabal-install/Main.hs
with
13 additions
and
5 deletions
cabal-install/Main.hs
+
13
−
5
View file @
121c9de9
...
...
@@ -845,7 +845,9 @@ cleanAction cleanFlags extraArgs _globalFlags =
listAction
::
ListFlags
->
[
String
]
->
GlobalFlags
->
IO
()
listAction
listFlags
extraArgs
globalFlags
=
do
let
verbosity
=
fromFlag
(
listVerbosity
listFlags
)
(
_useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
globalFlags
mempty
(
_useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
(
globalFlags
{
globalRequireSandbox
=
Flag
False
})
mempty
let
configFlags'
=
savedConfigureFlags
config
configFlags
=
configFlags'
{
configPackageDBs
=
configPackageDBs
configFlags'
...
...
@@ -865,7 +867,9 @@ infoAction :: InfoFlags -> [String] -> GlobalFlags -> IO ()
infoAction
infoFlags
extraArgs
globalFlags
=
do
let
verbosity
=
fromFlag
(
infoVerbosity
infoFlags
)
targets
<-
readUserTargets
verbosity
extraArgs
(
_useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
globalFlags
mempty
(
_useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
(
globalFlags
{
globalRequireSandbox
=
Flag
False
})
mempty
let
configFlags'
=
savedConfigureFlags
config
configFlags
=
configFlags'
{
configPackageDBs
=
configPackageDBs
configFlags'
...
...
@@ -887,7 +891,9 @@ updateAction verbosityFlag extraArgs globalFlags = do
unless
(
null
extraArgs
)
$
die
$
"'update' doesn't take any extra arguments: "
++
unwords
extraArgs
let
verbosity
=
fromFlag
verbosityFlag
(
_useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
globalFlags
NoFlag
(
_useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
(
globalFlags
{
globalRequireSandbox
=
Flag
False
})
NoFlag
let
globalFlags'
=
savedGlobalFlags
config
`
mappend
`
globalFlags
update
verbosity
(
globalRepos
globalFlags'
)
...
...
@@ -1050,7 +1056,9 @@ unpackAction getFlags extraArgs globalFlags = do
initAction
::
InitFlags
->
[
String
]
->
GlobalFlags
->
IO
()
initAction
initFlags
_extraArgs
globalFlags
=
do
let
verbosity
=
fromFlag
(
initVerbosity
initFlags
)
(
_useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
globalFlags
mempty
(
_useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
(
globalFlags
{
globalRequireSandbox
=
Flag
False
})
mempty
let
configFlags
=
savedConfigureFlags
config
(
comp
,
_
,
conf
)
<-
configCompilerAux'
configFlags
initCabal
verbosity
...
...
@@ -1098,7 +1106,7 @@ execAction :: ExecFlags -> [String] -> GlobalFlags -> IO ()
execAction
execFlags
extraArgs
globalFlags
=
do
let
verbosity
=
fromFlag
(
execVerbosity
execFlags
)
(
useSandbox
,
config
)
<-
loadConfigOrSandboxConfig
verbosity
globalFlags
mempty
mempty
let
configFlags
=
savedConfigureFlags
config
(
comp
,
platform
,
conf
)
<-
configCompilerAux'
configFlags
exec
verbosity
useSandbox
comp
platform
conf
extraArgs
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment