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

run curl when configured to do it at runtime, even if not available at build time

Browse source
This commit is contained in:
Joey Hess 2018-04-06 21:17:36 -04:00
parent db9524bfcc
commit c8f2d302dc
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Utility/Url.hs
View file

@ -34,7 +34,6 @@ module Utility.Url (
import Common import Common
import Utility.Metered import Utility.Metered
import qualified BuildInfo
import Network.URI import Network.URI
import Network.HTTP.Types import Network.HTTP.Types
@ -173,8 +172,7 @@ getUrlInfo url uo = case parseURIRelaxed url of
sz <- getFileSize' f stat sz <- getFileSize' f stat
found (Just sz) Nothing found (Just sz) Nothing
Nothing -> dne Nothing -> dne
| BuildInfo.curl -> existscurl u | otherwise -> existscurl u
| otherwise -> dne
Nothing -> dne Nothing -> dne
where where
dne = return $ UrlInfo False Nothing Nothing dne = return $ UrlInfo False Nothing Nothing
@ -271,8 +269,7 @@ download meterupdate url file uo = go `catchNonAsync` (const $ return False)
withMeteredFile src meterupdate $ withMeteredFile src meterupdate $
L.writeFile file L.writeFile file
return True return True
| BuildInfo.curl -> downloadcurl | otherwise -> downloadcurl
| otherwise -> return False
Nothing -> return False Nothing -> return False
downloadconduit req = catchMaybeIO (getFileSize file) >>= \case downloadconduit req = catchMaybeIO (getFileSize file) >>= \case