Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
5dc91386
Commit
5dc91386
authored
Jul 10, 2018
by
Alexis Williams
Browse files
Fix code clean-up error
parent
dbffa512
Changes
1
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/CmdInstall.hs
View file @
5dc91386
...
...
@@ -253,9 +253,15 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, newInstal
Just
(
pkgId
::
PackageId
)
|
pkgVersion
pkgId
/=
nullVersion
->
Right
pkgId
_
->
Left
str
packageSpecifiers
=
flip
fmap
packageIds
$
\
case
PackageIdentifier
{
..
}
|
pkgVersion
==
nullVersion
->
NamedPackage
pkgName
[]
|
otherwise
->
NamedPackage
pkgName
[
PackagePropertyVersion
(
thisVersion
pkgVersion
)]
packageTargets
=
flip
TargetPackageNamed
Nothing
.
pkgName
<$>
packageIds
if
null
targetStrings'
then
return
(
packageSpecifiers
,
packageTargets
,
projectConfig
localBaseCtx
)
then
return
(
packageSpecifiers
,
packageTargets
,
projectConfig
localBaseCtx
)
else
do
targetSelectors
<-
either
(
reportTargetSelectorProblems
verbosity
)
return
=<<
readTargetSelectors
(
localPackages
localBaseCtx
)
targetStrings'
...
...
@@ -338,14 +344,6 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, newInstal
then
return
(
hackagePkgs
,
hackageTargets
)
else
return
(
local
++
hackagePkgs
,
targets'
++
hackageTargets
)
let
packageSpecifiers
=
flip
fmap
packageIds
$
\
case
PackageIdentifier
{
..
}
|
pkgVersion
==
nullVersion
->
NamedPackage
pkgName
[]
|
otherwise
->
NamedPackage
pkgName
[
PackagePropertyVersion
(
thisVersion
pkgVersion
)]
packageTargets
=
flip
TargetPackageNamed
Nothing
.
pkgName
<$>
packageIds
return
(
specs
++
packageSpecifiers
,
selectors
++
packageTargets
,
projectConfig
localBaseCtx
)
withoutProject
=
do
...
...
Write
Preview
Supports
Markdown
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