diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-24 22:00:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-24 22:00:25 -0400 |
| commit | 9f9f1decca4a06d81ce97b64ef1a06fda3b8efad (patch) | |
| tree | 1f207862430497549281d510837dfcd9782f69af /Annex/Content.hs | |
| parent | ba6f7e1e38063e4b338d6a7537b575411193b2b6 (diff) | |
add UrlOptions sum type
Diffstat (limited to 'Annex/Content.hs')
| -rw-r--r-- | Annex/Content.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs index 60edb4975..45e8e9d47 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -514,9 +514,8 @@ saveState nocommit = doSideAction $ do downloadUrl :: [Url.URLString] -> FilePath -> Annex Bool downloadUrl urls file = go =<< annexWebDownloadCommand <$> Annex.getGitConfig where - go Nothing = do - (headers, options) <- getHttpHeadersOptions - anyM (\u -> Url.withUserAgent $ Url.download u headers options file) urls + go Nothing = Url.withUrlOptions $ \uo -> + anyM (\u -> Url.download u file uo) urls go (Just basecmd) = liftIO $ anyM (downloadcmd basecmd) urls downloadcmd basecmd url = boolSystem "sh" [Param "-c", Param $ gencmd url basecmd] |