[commit: Cabal] master: Tweak to conflict constraint error message (d04e454)

[Ian Lynagh]

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

On branch  : master

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

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

commit d04e4542cdc0d0d6925c59db76f54a918c6ccf88
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Sun Mar 27 18:02:52 2011 +0000

    Tweak to conflict constraint error message

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

 .../Distribution/Client/Dependency/TopDown.hs      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Distribution/Client/Dependency/TopDown.hs b/cabal-install/Distribution/Client/Dependency/TopDown.hs
index d0c4d03..e0b73f9 100644
--- a/cabal-install/Distribution/Client/Dependency/TopDown.hs
+++ b/cabal-install/Distribution/Client/Dependency/TopDown.hs
@@ -834,8 +834,8 @@ showFailure (DependencyConflict pkg dep _ conflicts) =
              | (pkg', reasons) <- conflicts, reason <- reasons ]
 
 showFailure (TopLevelVersionConstraintConflict name ver conflicts) =
-     "constraints conflict: "
-  ++ "top level constraint " ++ displayDep (Dependency name ver) ++ " however\n"
+     "constraints conflict: we have the top level constraint "
+  ++ displayDep (Dependency name ver) ++ ", but\n"
   ++ unlines [ showExclusionReason (packageId pkg') reason
              | (pkg', reasons) <- conflicts, reason <- reasons ]