[commit: Cabal] master: Make the upgrade command take all the install command flags (19b6c6e)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/19b6c6e2652b13fae67860304a6a3966fab19e99

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

commit 19b6c6e2652b13fae67860304a6a3966fab19e99
Author: Duncan Coutts <duncan at haskell.org>
Date:   Wed Jul 30 18:33:09 2008 +0000

    Make the upgrade command take all the install command flags

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

 cabal-install/Distribution/Client/Setup.hs |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
index 64aadf6..e769e46 100644
--- a/cabal-install/Distribution/Client/Setup.hs
+++ b/cabal-install/Distribution/Client/Setup.hs
@@ -111,9 +111,7 @@ upgradeCommand = configureCommand {
     commandDescription  = Nothing,
     commandUsage        = usagePackages "upgrade",
     commandDefaultFlags = (mempty, defaultInstallFlags),
-    commandOptions      = \showOrParseArgs ->
-         liftOptionsFst (commandOptions configureCommand showOrParseArgs)
-      ++ liftOptionsSnd [optionDryRun]
+    commandOptions      = commandOptions installCommand
   }
 
 {-
@@ -226,7 +224,10 @@ installCommand = configureCommand {
   commandOptions      = \showOrParseArgs ->
     liftOptionsFst (commandOptions configureCommand showOrParseArgs) ++
     liftOptionsSnd
-     ([ optionDryRun
+     ([ option [] ["dry-run"]
+          "Do not install anything, only print what would be installed."
+          installDryRun (\v flags -> flags { installDryRun = v })
+          trueArg
 
       , option [] ["root-cmd"]
           "Command used to gain root privileges, when installing with --global."
@@ -250,13 +251,6 @@ installCommand = configureCommand {
           _ -> [])
   }
 
-optionDryRun :: OptionField InstallFlags
-optionDryRun =
-  option [] ["dry-run"]
-    "Do not install anything, only print what would be installed."
-    installDryRun (\v flags -> flags { installDryRun = v })
-    trueArg
-
 instance Monoid InstallFlags where
   mempty = defaultInstallFlags
   mappend a b = InstallFlags {