From c78ab2d36085a148589cdfcfc557f1bf691b9553 Mon Sep 17 00:00:00 2001 From: Sasha Bogicevic Date: Mon, 23 Mar 2020 22:21:51 +0100 Subject: [PATCH] Mention password-command option in upload --help --- cabal-install/Distribution/Client/Setup.hs | 2 +- cabal-install/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs index 84946181ef5..776da523a50 100644 --- a/cabal-install/Distribution/Client/Setup.hs +++ b/cabal-install/Distribution/Client/Setup.hs @@ -2201,7 +2201,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/cabal-install/changelog b/cabal-install/changelog index bf1f18f9153..d88214dd5a5 100644 --- a/cabal-install/changelog +++ b/cabal-install/changelog @@ -1,6 +1,10 @@ -*-change-log-*- 3.2.0.0 Herbert Valerio Riedel April 2020 +3.3.0.1 + * `upload --help` now includes `password-command` as a config file option (#5224) + +3.2.0.0 Someone February 2020 * `v2-build` (and other `v2-`prefixed commands) now accept the `--benchmark-option(s)` flags, which pass options to benchmark executables (analogous to how `--test-option(s)` works). (#6209)