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

Avoid running annex.http-headers-command more than once.

Browse source
This commit is contained in:
Joey Hess 2018-04-04 15:00:51 -04:00
parent 98cc34c211
commit 2ec07bc29f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
11 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Command/ImportFeed.hs
View file

@ -150,13 +150,13 @@ downloadFeed url
| Url.parseURIRelaxed url == Nothing = giveup "invalid feed url"
| otherwise = do
showOutput
uo <- Url.getUrlOptions
liftIO $ withTmpFile "feed" $ \f h -> do
hClose h
ifM (Url.download url f uo)
( parseFeedString <$> readFileStrict f
, return Nothing
)
Url.withUrlOptions $ \ou ->
liftIO $ withTmpFile "feed" $ \f h -> do
hClose h
ifM (Url.download url f uo)
( parseFeedString <$> readFileStrict f
, return Nothing
)
performDownload :: ImportFeedOptions -> Cache -> ToDownload -> Annex Bool
performDownload opts cache todownload = case location todownload of