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

Mention password-command option in upload --help
haskell · Apr 9, 2020 · 9e63efb · 9e63efb
2 parents 244f4aa + 867b89b
commit 9e63efb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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,

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