[commit: Cabal] master: Move dryRun out of the misc options (b4e59c8)

[Paolo Capriotti]

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

On branch  : master

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

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

commit b4e59c86494b2936af553219bf9111a68e7d0d51
Author: Duncan Coutts <duncan at haskell.org>
Date:   Sat May 10 11:40:10 2008 +0000

    Move dryRun out of the misc options

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

 cabal-install/Hackage/Install.hs |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs
index 69337b5..4250d70 100644
--- a/cabal-install/Hackage/Install.hs
+++ b/cabal-install/Hackage/Install.hs
@@ -77,7 +77,6 @@ data BuildResult = DependentFailed PackageIdentifier
                  | BuildOk
 
 data InstallMisc = InstallMisc {
-    dryRun     :: Bool,
     rootCmd    :: Maybe FilePath,
     libVersion :: Maybe Version
   }
@@ -104,10 +103,10 @@ install verbosity packageDB repos comp conf configFlags installFlags deps = do
   case maybePlan of
     Left missing -> die $ "Unresolved dependencies: " ++ showDependencies missing
     Right installPlan -> do
-      when (dryRun miscOptions || verbosity >= verbose) $
+      when (dryRun || verbosity >= verbose) $
         printDryRun verbosity installPlan
 
-      unless (dryRun miscOptions) $ do
+      unless dryRun $ do
         executeInstallPlan installPlan $ \cpkg ->
           installConfiguredPackage configFlags cpkg $ \configFlags' apkg ->
             installAvailablePackage verbosity apkg $
@@ -144,8 +143,8 @@ install verbosity packageDB repos comp conf configFlags installFlags deps = do
       usePackageIndex  = if packageDB == UserPackageDB then index else Nothing,
       useProgramConfig = conf
     }
-    miscOptions = InstallMisc {
-      dryRun     = Cabal.fromFlag (installDryRun installFlags),
+    dryRun       = Cabal.fromFlag (installDryRun installFlags)
+    miscOptions  = InstallMisc {
       rootCmd    = if Cabal.fromFlag (Cabal.configUserInstall configFlags)
                      then Nothing      -- ignore --root-cmd if --user.
                      else Cabal.flagToMaybe (installRootCmd installFlags),