Skip to content

Commit eaf2763

Browse files
committed
Revert "Use default flags rather than mempty."
See #4737 This reverts commit 1e90ae4.
1 parent e67b7b1 commit eaf2763

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
@@ -1093,10 +1093,7 @@ upgradeCommand = configureCommand {
10931093
commandSynopsis = "(command disabled, use install instead)",
10941094
commandDescription = Nothing,
10951095
commandUsage = usageFlagsOrPackages "upgrade",
1096-
commandDefaultFlags = (commandDefaultFlags configureCommand,
1097-
defaultConfigExFlags,
1098-
defaultInstallFlags,
1099-
Cabal.defaultHaddockFlags),
1096+
commandDefaultFlags = (mempty, mempty, mempty, mempty),
11001097
commandOptions = commandOptions installCommand
11011098
}
11021099

@@ -1603,10 +1600,7 @@ installCommand = CommandUI {
16031600
++ " " ++ (map (const ' ') pname)
16041601
++ " "
16051602
++ " Change installation destination\n",
1606-
commandDefaultFlags = (commandDefaultFlags configureCommand,
1607-
defaultConfigExFlags,
1608-
defaultInstallFlags,
1609-
Cabal.defaultHaddockFlags),
1603+
commandDefaultFlags = (mempty, mempty, mempty, mempty),
16101604
commandOptions = \showOrParseArgs ->
16111605
liftOptions get1 set1
16121606
(filter ((`notElem` ["constraint", "dependency"

0 commit comments

Comments
 (0)