Commit 45b7334c authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺
Browse files

Revert applyDefaults introduced via new-install & new-update

See #4737
parent e7445f01
......@@ -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 )
......@@ -119,8 +118,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
......
......@@ -24,7 +24,7 @@ import Distribution.Client.JobControl
( newParallelJobControl, spawnJob, collectJob )
import Distribution.Client.Setup
( GlobalFlags, ConfigFlags(..), ConfigExFlags, InstallFlags
, UpdateFlags, applyFlagDefaults, defaultUpdateFlags
, UpdateFlags, defaultUpdateFlags
, RepoContext(..) )
import Distribution.Simple.Setup
( HaddockFlags, fromFlagOrDefault )
......@@ -107,8 +107,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 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment