Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/25d7929a2872725738531ee1c2a8dd2c1c986703 >--------------------------------------------------------------- commit 25d7929a2872725738531ee1c2a8dd2c1c986703 Author: Duncan Coutts <[email protected]> Date: Fri May 30 16:54:45 2008 +0000 Add resolveDependenciesWithProgress nd clean up header info >--------------------------------------------------------------- cabal-install/Hackage/Dependency.hs | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs index 6cc0e6a..4b63120 100644 --- a/cabal-install/Hackage/Dependency.hs +++ b/cabal-install/Hackage/Dependency.hs @@ -1,20 +1,22 @@ ----------------------------------------------------------------------------- -- | -- Module : Hackage.Dependency --- Copyright : (c) David Himmelstrup 2005, Bjorn Bringert 2007 +-- Copyright : (c) David Himmelstrup 2005, +-- Bjorn Bringert 2007 +-- Duncan Coutts 2008 -- License : BSD-like -- --- Maintainer : [email protected] +-- Maintainer : [email protected] -- Stability : provisional -- Portability : portable -- --- Various kinds of dependency resolution and utilities. +-- Top level interface to dependency resolution. ----------------------------------------------------------------------------- -module Hackage.Dependency - ( - resolveDependencies - , upgradableDependencies - ) where +module Hackage.Dependency ( + resolveDependencies, + resolveDependenciesWithProgress, + upgradableDependencies, + ) where import Hackage.Dependency.Naive (naiveResolver) import Hackage.Dependency.Bogus (bogusResolver) @@ -55,13 +57,22 @@ resolveDependencies :: OS -> PackageIndex AvailablePackage -> [UnresolvedDependency] -> Either String (InstallPlan a) -resolveDependencies os arch comp (Just installed) available deps = +resolveDependencies os arch comp installed available deps = foldProgress (flip const) Left Right $ + resolveDependenciesWithProgress os arch comp installed available deps + +resolveDependenciesWithProgress :: OS + -> Arch + -> CompilerId + -> Maybe (PackageIndex InstalledPackageInfo) + -> PackageIndex AvailablePackage + -> [UnresolvedDependency] + -> Progress String String (InstallPlan a) +resolveDependenciesWithProgress os arch comp (Just installed) available deps = dependencyResolver defaultResolver os arch comp installed available deps -resolveDependencies os arch comp Nothing available deps = - foldProgress (flip const) Left Right $ +resolveDependenciesWithProgress os arch comp Nothing available deps = dependencyResolver bogusResolver os arch comp mempty available deps _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
