[commit: Cabal] master: do not print reinstall warning if --override-reinstall-check has been specified (50fa937)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/50fa9371d6e0e70c9e3172fb7d45cdd8995d580e

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

commit 50fa9371d6e0e70c9e3172fb7d45cdd8995d580e
Author: Andres Loeh <andres at well-typed.com>
Date:   Mon Nov 7 10:15:01 2011 +0000

    do not print reinstall warning if --override-reinstall-check has been specified

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

 cabal-install/Distribution/Client/Install.hs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index 5644b72..e8eee2b 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -355,8 +355,8 @@ checkPrintPlan verbosity installed installPlan installFlags = do
   when (dryRun || adaptedVerbosity >= verbose) $
     printDryRun adaptedVerbosity lPlan
 
-  when containsReinstalls $
-    (if dryRun || overrideReinstall then notice adaptedVerbosity else die) $
+  when (containsReinstalls && not overrideReinstall) $
+    (if dryRun then notice adaptedVerbosity else die) $
          "The install plan contains reinstalls which can break "
       ++ "your GHC installation.\nYou can use the --avoid-reinstalls option "
       ++ "to try to avoid this or try\nto ghc-pkg unregister the version of "