diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-24 21:29:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-24 21:29:37 -0400 |
| commit | b6fb2e3a3384d2b9a92002aaf26c0c0d535ee4d3 (patch) | |
| tree | 9dca4e7d6168983ebc0497672c4bdf6de7a82f31 /Annex | |
| parent | d2ff4e12d0ae0d32263e258ea7c2a283d1d92149 (diff) | |
Make annex.web-options be used in several places that call curl.
Diffstat (limited to 'Annex')
| -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 bffef19f4..60edb4975 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -515,9 +515,8 @@ downloadUrl :: [Url.URLString] -> FilePath -> Annex Bool downloadUrl urls file = go =<< annexWebDownloadCommand <$> Annex.getGitConfig where go Nothing = do - opts <- map Param . annexWebOptions <$> Annex.getGitConfig - headers <- getHttpHeaders - anyM (\u -> Url.withUserAgent $ Url.download u headers opts file) urls + (headers, options) <- getHttpHeadersOptions + anyM (\u -> Url.withUserAgent $ Url.download u headers options file) urls go (Just basecmd) = liftIO $ anyM (downloadcmd basecmd) urls downloadcmd basecmd url = boolSystem "sh" [Param "-c", Param $ gencmd url basecmd] |