cabal-install 1.20.0.6 → 1.20.1.0
raw patch · 4 files changed
+16/−32 lines, 4 files
Files
- Distribution/Client/HttpUtils.hs +6/−6
- Distribution/Client/Upload.hs +5/−22
- bootstrap.sh +4/−3
- cabal-install.cabal +1/−1
Distribution/Client/HttpUtils.hs view
@@ -17,8 +17,8 @@ import Network.URI ( URI (..), URIAuth (..) ) import Network.Browser- ( BrowserAction, browse- , setOutHandler, setErrHandler, setProxy, setAuthorityGen, request)+ ( BrowserAction, browse, setAllowBasicAuth, setAuthorityGen+ , setOutHandler, setErrHandler, setProxy, request) import Network.Stream ( Result, ConnError(..) ) import Control.Monad@@ -80,10 +80,10 @@ -> Maybe String -- ^ Optional etag to check if we already have the latest file. -> IO (Result (Response ByteString)) getHTTP verbosity uri etag = liftM (\(_, resp) -> Right resp) $- cabalBrowse verbosity (return ()) (request (mkRequest uri etag))+ cabalBrowse verbosity Nothing (request (mkRequest uri etag)) cabalBrowse :: Verbosity- -> BrowserAction s ()+ -> Maybe (String, String) -> BrowserAction s a -> IO a cabalBrowse verbosity auth act = do@@ -92,8 +92,8 @@ setProxy p setErrHandler (warn verbosity . ("http error: "++)) setOutHandler (debug verbosity)- auth- setAuthorityGen (\_ _ -> return Nothing)+ setAllowBasicAuth False+ setAuthorityGen (\_ _ -> return auth) act downloadURI :: Verbosity
Distribution/Client/Upload.hs view
@@ -18,12 +18,10 @@ import qualified Distribution.Client.BuildReports.Upload as BuildReport import Network.Browser- ( BrowserAction, request- , Authority(..), addAuthority )+ ( request ) import Network.HTTP ( Header(..), HeaderName(..), findHeader , Request(..), RequestMethod(..), Response(..) )-import Network.TCP (HandleStream) import Network.URI (URI(uriPath), parseURI) import Data.Char (intToDigit)@@ -53,12 +51,7 @@ else targetRepoURI{uriPath = uriPath targetRepoURI `FilePath.Posix.combine` "upload"} Username username <- maybe promptUsername return mUsername Password password <- maybe promptPassword return mPassword- let auth = addAuthority AuthBasic {- auRealm = "Hackage",- auUsername = username,- auPassword = password,- auSite = uploadURI- }+ let auth = Just (username, password) flip mapM_ paths $ \path -> do notice verbosity $ "Uploading " ++ path ++ "... " handlePackage verbosity uploadURI auth path@@ -84,17 +77,9 @@ report :: Verbosity -> [Repo] -> Maybe Username -> Maybe Password -> IO () report verbosity repos mUsername mPassword = do- let uploadURI = if isOldHackageURI targetRepoURI- then legacyUploadURI- else targetRepoURI{uriPath = ""} Username username <- maybe promptUsername return mUsername Password password <- maybe promptPassword return mPassword- let auth = addAuthority AuthBasic {- auRealm = "Hackage",- auUsername = username,- auPassword = password,- auSite = uploadURI- }+ let auth = Just (username, password) forM_ repos $ \repo -> case repoKind repo of Left remoteRepo -> do dotCabal <- defaultCabalDir@@ -113,16 +98,14 @@ cabalBrowse verbosity auth $ BuildReport.uploadReports (remoteRepoURI remoteRepo) [(report', Just buildLog)] return () Right{} -> return ()- where- targetRepoURI = remoteRepoURI $ last [ remoteRepo | Left remoteRepo <- map repoKind repos ] --FIXME: better error message when no repos are given check :: Verbosity -> [FilePath] -> IO () check verbosity paths = do flip mapM_ paths $ \path -> do notice verbosity $ "Checking " ++ path ++ "... "- handlePackage verbosity checkURI (return ()) path+ handlePackage verbosity checkURI Nothing path -handlePackage :: Verbosity -> URI -> BrowserAction (HandleStream ByteString) ()+handlePackage :: Verbosity -> URI -> Maybe (String, String) -> FilePath -> IO () handlePackage verbosity uri auth path = do req <- mkRequest uri path
bootstrap.sh view
@@ -308,13 +308,14 @@ do_pkg "text" ${TEXT_VER} ${TEXT_VER_REGEXP} do_pkg "parsec" ${PARSEC_VER} ${PARSEC_VER_REGEXP} do_pkg "network" ${NETWORK_VER} ${NETWORK_VER_REGEXP}++# We conditionally install network-uri, depending on the network version.+do_network_uri_pkg+ do_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP} do_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP} do_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP} do_pkg "stm" ${STM_VER} ${STM_VER_REGEXP}--# We conditionally install network-uri, depending on the network version.-do_network_uri_pkg install_pkg "cabal-install"
cabal-install.cabal view
@@ -1,5 +1,5 @@ Name: cabal-install-Version: 1.20.0.6+Version: 1.20.1.0 Synopsis: The command-line interface for Cabal and Hackage. Description: The \'cabal\' command-line program simplifies the process of managing