Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/6b6a982e8240bedaa680181c02c6a9aa5c8df232 >--------------------------------------------------------------- commit 6b6a982e8240bedaa680181c02c6a9aa5c8df232 Author: Andres Loeh <[email protected]> Date: Sun Jul 3 13:20:11 2011 +0000 Refactoring: use toConflictSet >--------------------------------------------------------------- .../Client/Dependency/Modular/Builder.hs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs b/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs index 32178da..da701d3 100644 --- a/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs +++ b/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs @@ -81,7 +81,7 @@ build = ana go -- and then handle each instance in turn. go bs@(BS { index = idx, scope = sc, next = OneGoal (OpenGoal (Simple (Dep qpn@(Q _ pn) _)) gr) }) = case M.lookup pn idx of - Nothing -> FailF (P qpn `S.insert` goalReasonsToVars gr) (BuildFailureNotInIndex pn) + Nothing -> FailF (toConflictSet (Goal (P qpn) gr)) (BuildFailureNotInIndex pn) Just pis -> PChoiceF qpn (gr, sc) (P.fromList (L.map (\ (i, info) -> (i, bs { next = Instance qpn i info gr })) (M.toList pis))) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
