Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/93cb29a05116aecd624873b15a833ae79c6a525f >--------------------------------------------------------------- commit 93cb29a05116aecd624873b15a833ae79c6a525f Author: Duncan Coutts <[email protected]> Date: Fri Mar 4 22:13:07 2011 +0000 Fix silly bug in cabal configure. Ticket #805. I made a mistake during the recent refactoring work and was using the dependency planner in the wrong way. The planner was being given the available source packages and duely picking them to satisfy dependencies, but for configure we're supposed to assume that all dependencies are installed already. >--------------------------------------------------------------- cabal-install/Distribution/Client/Configure.hs | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cabal-install/Distribution/Client/Configure.hs b/cabal-install/Distribution/Client/Configure.hs index 93eb82c..5d72ce0 100644 --- a/cabal-install/Distribution/Client/Configure.hs +++ b/cabal-install/Distribution/Client/Configure.hs @@ -49,6 +49,8 @@ import Distribution.System import Distribution.Verbosity as Verbosity ( Verbosity ) +import Data.Monoid (Monoid(..)) + -- | Configure the package found in the local directory configure :: Verbosity -> PackageDBStack @@ -121,7 +123,7 @@ planLocalPackage :: Verbosity -> Compiler -> AvailablePackageDb -> IO (Progress String String InstallPlan) planLocalPackage verbosity comp configFlags configExFlags installed - availabledb = do + (AvailablePackageDb _ availablePrefs) = do pkg <- readPackageDescription verbosity =<< defaultPackageDesc verbosity let -- We create a local package and ask to resolve a dependency on it @@ -148,8 +150,10 @@ planLocalPackage verbosity comp configFlags configExFlags installed [ PackageFlagsConstraint (packageName pkg) (configConfigurationsFlags configFlags) ] - $ standardInstallPolicy installed availabledb - [SpecificSourcePackage localPkg] + $ standardInstallPolicy + installed + (AvailablePackageDb mempty availablePrefs) + [SpecificSourcePackage localPkg] return (resolveDependencies buildPlatform (compilerId comp) resolverParams) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
