Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/45f97282206e3a403316f27e4122e8d41f7fac7e >--------------------------------------------------------------- commit 45f97282206e3a403316f27e4122e8d41f7fac7e Author: Duncan Coutts <[email protected]> Date: Sun Mar 27 18:02:06 2011 +0000 Log package exclusions due to top level constraints >--------------------------------------------------------------- .../Distribution/Client/Dependency/TopDown.hs | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cabal-install/Distribution/Client/Dependency/TopDown.hs b/cabal-install/Distribution/Client/Dependency/TopDown.hs index 7f82828..d0c4d03 100644 --- a/cabal-install/Distribution/Client/Dependency/TopDown.hs +++ b/cabal-install/Distribution/Client/Dependency/TopDown.hs @@ -293,15 +293,15 @@ addTopLevelTargets (pkg:pkgs) cs = addTopLevelConstraints :: [PackageConstraint] -> Constraints - -> Progress a Failure Constraints + -> Progress Log Failure Constraints addTopLevelConstraints [] cs = Done cs addTopLevelConstraints (PackageFlagsConstraint _ _ :deps) cs = addTopLevelConstraints deps cs addTopLevelConstraints (PackageVersionConstraint pkg ver:deps) cs = case addTopLevelVersionConstraint pkg ver cs of - Satisfiable cs' _ -> - addTopLevelConstraints deps cs' + Satisfiable cs' pkgids -> + foldr (Step . Exclude) (addTopLevelConstraints deps cs') pkgids Unsatisfiable -> Fail (TopLevelVersionConstraintUnsatisfiable pkg ver) @@ -311,7 +311,8 @@ addTopLevelConstraints (PackageVersionConstraint pkg ver:deps) cs = addTopLevelConstraints (PackageInstalledConstraint pkg:deps) cs = case addTopLevelInstalledConstraint pkg cs of - Satisfiable cs' _ -> addTopLevelConstraints deps cs' + Satisfiable cs' pkgids -> + foldr (Step . Exclude) (addTopLevelConstraints deps cs') pkgids Unsatisfiable -> Fail (TopLevelInstallConstraintUnsatisfiable pkg) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
