Skip to content
Browse files

Improved comments in Configure

  • Loading branch information...
1 parent d758cb9 commit 7528aa66ca507756d81b662974fdcf6677b06151 @phischu committed Aug 10, 2012
Showing with 1 addition and 12 deletions.
  1. +1 −12 Cabal/Distribution/Simple/Configure.hs
View
13 Cabal/Distribution/Simple/Configure.hs
@@ -366,7 +366,7 @@ configure (pkg_descr0, pbi) cfg
(updatePackageDescription pbi pkg_descr)
-- we first select the package instances that are specified
- -- on the command line via -installed-package-id
+ -- on the command line via --dependency
-- we then resolve the remaining not yet satisfied constraints
-- packages with higher version have primary priority
-- packages that were installed later have secondary priority
@@ -395,17 +395,6 @@ configure (pkg_descr0, pbi) cfg
internalPkgDeps = resolvedInternalPackages
externalPkgDeps = resolvedExternalPackages ++ selectedDependencies
-{-
-
-selectDependencies =
- (\xs -> ([ x | Left x <- xs ], [ x | Right x <- xs ]))
- . map (selectDependency internalPackageSet installedPackageSet)
-
- (failedDeps, allPkgDeps) = selectDependencies (buildDepends pkg_descr)
-
- internalPkgDeps = [ pkgid | InternalDependency _ pkgid <- allPkgDeps ]
- externalPkgDeps = [ pkg | ExternalDependency _ pkg <- allPkgDeps ]
--}
when (not (null internalPkgDeps) && not (newPackageDepsBehaviour pkg_descr)) $
die $ "The field 'build-depends: "
++ intercalate ", " (map (display . packageName) internalPkgDeps)

0 comments on commit 7528aa6

Please sign in to comment.
Something went wrong with that request. Please try again.