Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a64f68843f04e0c6a795f179d5ff50f0987bb9ba >--------------------------------------------------------------- commit a64f68843f04e0c6a795f179d5ff50f0987bb9ba Author: bjorn <[email protected]> Date: Sun Oct 7 13:16:48 2007 +0000 Oops, I removed the filtering out of already installed packages from resolveDependencies. >--------------------------------------------------------------- .../src/Network/Hackage/CabalInstall/Dependency.hs | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cabal-install/src/Network/Hackage/CabalInstall/Dependency.hs b/cabal-install/src/Network/Hackage/CabalInstall/Dependency.hs index 3aff9d9..a6d7462 100644 --- a/cabal-install/src/Network/Hackage/CabalInstall/Dependency.hs +++ b/cabal-install/src/Network/Hackage/CabalInstall/Dependency.hs @@ -175,16 +175,6 @@ resolveDependency comp installed available dep _ -> rDep -- |Resolve some dependencies from the known packages while filtering out installed packages. --- The result hasn't been modified to put the dependencies in front of the packages. -resolveDependenciesAux :: Compiler - -> [PackageIdentifier] -- ^Installed packages. - -> [PkgInfo] -- ^ Installable packages - -> [UnresolvedDependency] -- ^Dependencies in need of resolution. - -> [ResolvedPackage] -resolveDependenciesAux comp installed available = - map (resolveDependency comp installed available) - --- |Resolve some dependencies from the known packages while filtering out installed packages. -- The result has been modified to put the dependencies in front of the packages. resolveDependencies :: ConfigFlags -> Compiler @@ -194,4 +184,6 @@ resolveDependencies :: ConfigFlags resolveDependencies cfg comp conf deps = do installed <- listInstalledPackages cfg comp conf available <- getKnownPackages cfg - return $ flattenDepList installed $ resolveDependenciesAux comp installed available deps + return $ flattenDepList installed $ + map (resolveDependency comp installed available) $ + filter (not . isInstalled installed . dependency) deps _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
