Skip to content
GitLab
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
d9ade6b8
Commit
d9ade6b8
authored
Dec 06, 2013
by
Mikhail Glushenkov
Browse files
Small refactoring for readability.
parent
6945d9f0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/Simple/Configure.hs
View file @
d9ade6b8
...
...
@@ -355,9 +355,7 @@ configure (pkg_descr0, pbi) cfg
--
-- TODO: mention '--exact-configuration' in the error message
-- when this fails?
(
depName
`
Map
.
member
`
requiredDepsMap
)
||
(
pkgName
pid
==
depName
&&
pkgVersion
pid
`
withinRange
`
verRange
)
(
depName
`
Map
.
member
`
requiredDepsMap
)
||
isInternalDep
|
otherwise
=
-- Normal operation: just look up dependency in the package
...
...
@@ -365,6 +363,8 @@ configure (pkg_descr0, pbi) cfg
not
.
null
.
PackageIndex
.
lookupDependency
pkgs'
$
d
where
pkgs'
=
PackageIndex
.
insert
internalPackage
installedPackageSet
isInternalDep
=
pkgName
pid
==
depName
&&
pkgVersion
pid
`
withinRange
`
verRange
enableTest
t
=
t
{
testEnabled
=
fromFlag
(
configTests
cfg
)
}
flaggedTests
=
map
(
\
(
n
,
t
)
->
(
n
,
mapTreeData
enableTest
t
))
(
condTestSuites
pkg_descr0
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment