Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/606f474e4ee59600947ec4d37b92926d8089fe43 >--------------------------------------------------------------- commit 606f474e4ee59600947ec4d37b92926d8089fe43 Author: Duncan Coutts <[email protected]> Date: Fri Jun 6 15:28:40 2008 +0000 trivial doc improvement and unused name fix >--------------------------------------------------------------- cabal-install/Hackage/InstallPlan.hs | 4 ++-- cabal-install/Hackage/Types.hs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cabal-install/Hackage/InstallPlan.hs b/cabal-install/Hackage/InstallPlan.hs index 28e1112..34f79e3 100644 --- a/cabal-install/Hackage/InstallPlan.hs +++ b/cabal-install/Hackage/InstallPlan.hs @@ -261,8 +261,8 @@ lookupConfiguredPackage' :: InstallPlan a -> PackageIdentifier -> Maybe ConfiguredPackage lookupConfiguredPackage' plan pkgid = case PackageIndex.lookupPackageId (planIndex plan) pkgid of - Just (Configured pkg) -> Just pkg - Just (Failed _ reason) -> Nothing + Just (Configured pkg) -> Just pkg + Just (Failed _ _) -> Nothing _ -> internalError $ "not configured or no such pkg " ++ display pkgid -- ------------------------------------------------------------ diff --git a/cabal-install/Hackage/Types.hs b/cabal-install/Hackage/Types.hs index c11675c..8cb19ab 100644 --- a/cabal-install/Hackage/Types.hs +++ b/cabal-install/Hackage/Types.hs @@ -29,8 +29,10 @@ newtype Password = Password { unPassword :: String } data ConfiguredPackage = ConfiguredPackage AvailablePackage -- package info, including repo FlagAssignment -- complete flag assignment for the package - [PackageIdentifier] -- exact dependencies, must be consistent with the - -- version constraints in the package info + [PackageIdentifier] -- set of exact dependencies. These must be + -- consistent with the 'buildDepends' in the + -- 'PackageDescrption' that you'd get by applying + -- the flag assignment. deriving Show instance Package ConfiguredPackage where _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
