Make the upgrade command take all the install command flags

haskell · Jul 30, 2008 · 5cb6ea3 · 5cb6ea3
1 parent 65c37db
commit 5cb6ea3
Showing 1 changed file with 5 additions and 11 deletions.
diff --git 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 {