[commit: Cabal] master: bugfix: wrong flag choice was sometimes shown in goal reasons (97eff49)
Ian Lynagh
igloo at earth.li
Fri Nov 4 18:08:04 CET 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/97eff49f89529c8ee1560010564d74495e4122ac
>---------------------------------------------------------------
commit 97eff49f89529c8ee1560010564d74495e4122ac
Author: Andres Loeh <andres at well-typed.com>
Date: Sat Oct 29 12:23:24 2011 +0000
bugfix: wrong flag choice was sometimes shown in goal reasons
>---------------------------------------------------------------
.../Client/Dependency/Modular/Builder.hs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs b/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs
index e74073e..ba4d927 100644
--- a/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs
+++ b/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs
@@ -92,8 +92,8 @@ build = ana go
-- TODO: Should we include the flag default in the tree?
go bs@(BS { scope = sc, next = OneGoal (OpenGoal (Flagged qfn b t f) gr) }) =
FChoiceF qfn (gr, sc) trivial (P.fromList (reorder b
- [(True, (extendOpen (getPN qfn) (L.map (flip OpenGoal (FDependency qfn b : gr)) t) bs) { next = Goals }),
- (False, (extendOpen (getPN qfn) (L.map (flip OpenGoal (FDependency qfn b : gr)) f) bs) { next = Goals })]))
+ [(True, (extendOpen (getPN qfn) (L.map (flip OpenGoal (FDependency qfn True : gr)) t) bs) { next = Goals }),
+ (False, (extendOpen (getPN qfn) (L.map (flip OpenGoal (FDependency qfn False : gr)) f) bs) { next = Goals })]))
where
reorder True = id
reorder False = reverse
More information about the Cvs-libraries
mailing list