Merge pull request #6680 from phadej/pr-6313-6609

Mention password-command option in upload --help

Merge pull request #6680 from phadej/pr-6313-6609
Mention password-command option in upload --help
9e63efb1 · Oleg Grenrus · GitHub · 244f4aaf · 867b89b8 · 9e63efb1
Unverified Commit 9e63efb1 authored Apr 09, 2020 by Oleg Grenrus Committed by GitHub Apr 09, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

cabal-install/Distribution/Client/Setup.hs cabal-install/Distribution/Client/Setup.hs +1 -1

changelog.d/issue-5224 changelog.d/issue-5224 +3 -0

No files found.
--- a/cabal-install/Distribution/Client/Setup.hs
+++ b/cabal-install/Distribution/Client/Setup.hs
@@ -2207,7 +2207,7 @@ uploadCommand = CommandUI {
    commandDescription  = Nothing,
    commandNotes        = Just $ \_ ->
         "You can store your Hackage login in the ~/.cabal/config file\n"
-      ++ relevantConfigValuesText ["username", "password"],
+      ++ relevantConfigValuesText ["username", "password", "password-command"],
    commandUsage        = \pname ->
         "Usage: " ++ pname ++ " upload [FLAGS] TARFILES\n",
    commandDefaultFlags = defaultUploadFlags,

--- a/changelog.d/issue-5224
+++ b/changelog.d/issue-5224
+synopsis: `upload --help` now includes `password-command` as a config file option (#5224)
+issues: #5224
+prs: #6609 #6313 #6680