Revert applyDefaults introduced via new-install & new-update

See haskell#4737
hvr · Nov 12, 2017 · 92a321b · 92a321b
1 parent e3aa190
commit 92a321b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/cabal-install/Distribution/Client/CmdInstall.hs b/cabal-install/Distribution/Client/CmdInstall.hs
@@ -21,8 +21,7 @@ import Distribution.Client.ProjectOrchestration
 import Distribution.Client.CmdErrorMessages
 
 import Distribution.Client.Setup
-         ( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
-         , applyFlagDefaults )
+         ( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags )
 import qualified Distribution.Client.Setup as Client
 import Distribution.Client.Types
          ( PackageSpecifier(NamedPackage), UnresolvedSourcePackage )
@@ -116,7 +115,7 @@ installCommand = CommandUI
 --
 installAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
             -> [String] -> GlobalFlags -> IO ()
-installAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
+installAction (configFlags, configExFlags, installFlags, haddockFlags)
             targetStrings globalFlags = do
   -- We never try to build tests/benchmarks for remote packages.
   -- So we set them as disabled by default and error if they are explicitly

diff --git a/cabal-install/Distribution/Client/CmdUpdate.hs b/cabal-install/Distribution/Client/CmdUpdate.hs
@@ -21,7 +21,7 @@ import Distribution.Client.JobControl
          ( newParallelJobControl, spawnJob, collectJob )
 import Distribution.Client.Setup
          ( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags, UpdateFlags
-         , applyFlagDefaults, defaultUpdateFlags, RepoContext(..) )
+         , defaultUpdateFlags, RepoContext(..) )
 import Distribution.Simple.Setup
          ( HaddockFlags, fromFlagOrDefault )
 import Distribution.Simple.Utils
@@ -102,7 +102,7 @@ instance Text UpdateRequest where
 
 updateAction :: (ConfigFlags, ConfigExFlags, InstallFlags, HaddockFlags)
              -> [String] -> GlobalFlags -> IO ()
-updateAction (applyFlagDefaults -> (configFlags, configExFlags, installFlags, haddockFlags))
+updateAction (configFlags, configExFlags, installFlags, haddockFlags)
              extraArgs globalFlags = do
 
   ProjectBaseContext {