[commit: Cabal] master: Fix username prompting for cabal upload (b240aec)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b240aecf7d06599161579462ab224dc47e83947d

>---------------------------------------------------------------

commit b240aecf7d06599161579462ab224dc47e83947d
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Tue Mar 15 22:47:21 2011 +0000

    Fix username prompting for cabal upload
    Fixes ticket #810

>---------------------------------------------------------------

 cabal-install/Distribution/Client/Config.hs |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/cabal-install/Distribution/Client/Config.hs b/cabal-install/Distribution/Client/Config.hs
index 27bbffc..c283222 100644
--- a/cabal-install/Distribution/Client/Config.hs
+++ b/cabal-install/Distribution/Client/Config.hs
@@ -367,7 +367,11 @@ configFieldDescriptions =
 
   ++ toSavedConfig liftReportFlag
        (commandOptions reportCommand ParseArgs)
-       ["verbose"] []
+       ["verbose", "username", "password"] []
+       --FIXME: this is a hack, hiding the username and password.
+       -- But otherwise it masks the upload ones. Either need to
+       -- share the options or make then distinct. In any case
+       -- they should probably be per-server.
 
   where
     toSavedConfig lift options exclusions replacements =