[commit: Cabal] master: Fix for when user supplies incorrect upload username/passwd (24b83c1)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/24b83c1bc9a2bb73d501abf8ad90ed16efa963cc

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

commit 24b83c1bc9a2bb73d501abf8ad90ed16efa963cc
Author: Duncan Coutts <duncan at haskell.org>
Date:   Mon Jun 23 11:33:15 2008 +0000

    Fix for when user supplies incorrect upload username/passwd
    Should now return a proper error rather than an internal
    error from the HTTP library.

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

 cabal-install/Hackage/Upload.hs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cabal-install/Hackage/Upload.hs b/cabal-install/Hackage/Upload.hs
index 2649b8e..9e3e61a 100644
--- a/cabal-install/Hackage/Upload.hs
+++ b/cabal-install/Hackage/Upload.hs
@@ -9,9 +9,10 @@ import Hackage.HttpUtils (proxy)
 import Distribution.Simple.Utils (debug, notice, warn)
 import Distribution.Verbosity (Verbosity)
 
-import Network.Browser (BrowserAction, browse, request, 
-                        Authority(..), addAuthority,
-                        setOutHandler, setErrHandler, setProxy)
+import Network.Browser
+         ( BrowserAction, browse, request
+         , Authority(..), addAuthority, setAuthorityGen
+         , setOutHandler, setErrHandler, setProxy )
 import Network.HTTP (Header(..), HeaderName(..), Request(..),
                      RequestMethod(..), Response(..))
 import Network.URI (URI, parseURI)
@@ -82,6 +83,7 @@ handlePackage verbosity uri auth path =
                    setErrHandler (warn verbosity . ("http error: "++))
                    setOutHandler (debug verbosity)
                    auth
+                   setAuthorityGen (\_ _ -> return Nothing)
                    request req
      debug verbosity $ show resp
      case rspCode resp of