importfeed: Fix feed download when curl is used.
This bug used to only afflict file:/// urls, but became more exposed
by b8f0b7309f
.
This commit is contained in:
parent
c65e71e6a5
commit
aa31af5594
2 changed files with 3 additions and 2 deletions
|
@ -150,9 +150,9 @@ downloadFeed url = do
|
|||
showOutput
|
||||
uo <- Url.getUrlOptions
|
||||
liftIO $ withTmpFile "feed" $ \f h -> do
|
||||
fileEncoding h
|
||||
hClose h
|
||||
ifM (Url.download url f uo)
|
||||
( parseFeedString <$> hGetContentsStrict h
|
||||
( parseFeedString <$> readFileStrictAnyEncoding f
|
||||
, return Nothing
|
||||
)
|
||||
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -12,6 +12,7 @@ git-annex (5.20150406.2) UNRELEASED; urgency=medium
|
|||
commit.
|
||||
* info: Display repository mode: bare when in a bare (non-direct mode)
|
||||
repo.
|
||||
* importfeed: Fix feed download when curl is used.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Mon, 06 Apr 2015 20:14:20 -0400
|
||||
|
||||
|
|
Loading…
Reference in a new issue