Skip to content

Commit

Permalink
Fix for when user supplies incorrect upload username/passwd
Browse files Browse the repository at this point in the history
Should now return a proper error rather than an internal
error from the HTTP library.
  • Loading branch information
dcoutts committed Jun 23, 2008
1 parent 8868c29 commit 22e4e41
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Hackage/Upload.hs
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 22e4e41

Please sign in to comment.