Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b6e0acd1215f5c6def1b4d4036bf7eb0f5165dbf

>---------------------------------------------------------------

commit b6e0acd1215f5c6def1b4d4036bf7eb0f5165dbf
Author: Andres Loeh <[email protected]>
Date:   Mon Jul 4 17:35:53 2011 +0000

    layout

>---------------------------------------------------------------

 .../Client/Dependency/Modular/Solver.hs            |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Solver.hs 
b/cabal-install/Distribution/Client/Dependency/Modular/Solver.hs
index db4f0de..6a8f085 100644
--- a/cabal-install/Distribution/Client/Dependency/Modular/Solver.hs
+++ b/cabal-install/Distribution/Client/Dependency/Modular/Solver.hs
@@ -36,13 +36,13 @@ solve sc idx userPrefs userConstraints userGoals =
   prunePhase       $
   buildPhase
   where
-    explorePhase = exploreTreeLog . backjump
-    heuristicsPhase = if preferEasyGoalChoices sc
-                        then P.deferDefaultFlagChoices . 
P.lpreferEasyGoalChoices
-                        else id
+    explorePhase     = exploreTreeLog . backjump
+    heuristicsPhase  = if preferEasyGoalChoices sc
+                         then P.deferDefaultFlagChoices . 
P.lpreferEasyGoalChoices
+                         else id
     preferencesPhase = P.preferPackagePreferences userPrefs
-    validationPhase = P.enforcePackageConstraints userConstraints .
-                      validateTree idx
-    prunePhase = (if avoidReinstalls sc then P.avoidReinstalls (const True) 
else id) .
-                 P.requireInstalled (== PackageName "base") -- never try to 
install a new "base"
-    buildPhase = buildTree idx userGoals
+    validationPhase  = P.enforcePackageConstraints userConstraints .
+                       validateTree idx
+    prunePhase       = (if avoidReinstalls sc then P.avoidReinstalls (const 
True) else id) .
+                       P.requireInstalled (== PackageName "base") -- never try 
to install a new "base"
+    buildPhase       = buildTree idx userGoals



_______________________________________________
Cvs-libraries mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-libraries

Reply via email to