mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

make curl follow redirs

Browse source
This commit is contained in:
Joey Hess 2011-07-01 21:52:27 -04:00
parent ace9de37e8
commit e6b9539a65
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Remote/Web.hs
View file

@ -115,6 +115,7 @@ urlexists url = do
_ <- setopt curl (CurlURL url) _ <- setopt curl (CurlURL url)
_ <- setopt curl (CurlNoBody True) _ <- setopt curl (CurlNoBody True)
_ <- setopt curl (CurlFailOnError True) _ <- setopt curl (CurlFailOnError True)
_ <- setopt curl (CurlFollowLocation True)
res <- perform curl res <- perform curl
return $ res == CurlOK return $ res == CurlOK
@ -122,5 +123,5 @@ download :: [URLString] -> FilePath -> Annex Bool
download [] _ = return False download [] _ = return False
download (url:us) file = do download (url:us) file = do
showProgress -- make way for curl progress bar showProgress -- make way for curl progress bar
ok <- liftIO $ boolSystem "curl" [Params "-C - -# -o", File file, File url] ok <- liftIO $ boolSystem "curl" [Params "-L -C - -# -o", File file, File url]
if ok then return ok else download us file if ok then return ok else download us file