Commit a7469b85 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov

'cabal configure' shouldn't accept the 'dependency' option.

parent 3c9600ed
......@@ -371,7 +371,8 @@ configFieldDescriptions =
++ toSavedConfig liftConfigFlag
(configureOptions ParseArgs)
(["builddir", "configure-option", "constraint"] ++ map fieldName installDirsFields)
(["builddir", "configure-option", "constraint", "dependency"]
++ map fieldName installDirsFields)
--FIXME: this is only here because viewAsFieldDescr gives us a parser
-- that only recognises 'ghc' etc, the case-sensitive flag names, not
......
......@@ -861,7 +861,8 @@ installCommand = CommandUI {
++ " Constrained package version\n",
commandDefaultFlags = (mempty, mempty, mempty, mempty),
commandOptions = \showOrParseArgs ->
liftOptions get1 set1 (filter ((/="constraint") . optionName) $
liftOptions get1 set1
(filter ((`notElem` ["constraint", "dependency"]) . optionName) $
configureOptions showOrParseArgs)
++ liftOptions get2 set2 (configureExOptions showOrParseArgs)
++ liftOptions get3 set3 (installOptions showOrParseArgs)
......
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