Skip to content

Commit 4117304

Browse files
committed
Revert "Use default flags rather than mempty."
See haskell#4737 This reverts commit 1e90ae4.
1 parent 58d7b8f commit 4117304

File tree

1 file changed

+2
-8
lines changed
  • cabal-install/Distribution/Client

1 file changed

+2
-8
lines changed

cabal-install/Distribution/Client/Setup.hs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,10 +1108,7 @@ upgradeCommand = configureCommand {
11081108
commandSynopsis = "(command disabled, use install instead)",
11091109
commandDescription = Nothing,
11101110
commandUsage = usageFlagsOrPackages "upgrade",
1111-
commandDefaultFlags = (commandDefaultFlags configureCommand,
1112-
defaultConfigExFlags,
1113-
defaultInstallFlags,
1114-
Cabal.defaultHaddockFlags),
1111+
commandDefaultFlags = (mempty, mempty, mempty, mempty),
11151112
commandOptions = commandOptions installCommand
11161113
}
11171114

@@ -1618,10 +1615,7 @@ installCommand = CommandUI {
16181615
++ " " ++ (map (const ' ') pname)
16191616
++ " "
16201617
++ " Change installation destination\n",
1621-
commandDefaultFlags = (commandDefaultFlags configureCommand,
1622-
defaultConfigExFlags,
1623-
defaultInstallFlags,
1624-
Cabal.defaultHaddockFlags),
1618+
commandDefaultFlags = (mempty, mempty, mempty, mempty),
16251619
commandOptions = \showOrParseArgs ->
16261620
liftOptions get1 set1
16271621
(filter ((`notElem` ["constraint", "dependency"

0 commit comments

Comments
 (0)