diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-03 14:32:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-03 14:32:26 -0400 |
| commit | 21376d8937b4ab2994338060d7a15eb8392c6f77 (patch) | |
| tree | 782ae53beb9dd72e7d585732b774274e4aa75d68 | |
| parent | b80370b6371ec5ea8f335dfe7ce88b828c0e4e49 (diff) | |
importfeed: Also ignore transient problems with downloading content from feeds.
| -rw-r--r-- | Command/ImportFeed.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs index 816865e8c..662daacf3 100644 --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -52,6 +52,8 @@ perform relaxed cache url = do Just l | not (null l) -> do ok <- all id <$> mapM (downloadEnclosure relaxed cache) l + unless ok $ + feedProblem url "problem downloading item" next $ cleanup url ok _ -> do feedProblem url "bad feed content" diff --git a/debian/changelog b/debian/changelog index 98bfd9445..59fdeff36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +git-annex (4.20130828) UNRELEASED; urgency=low + + * importfeed: Also ignore transient problems with downloading content + from feeds. + * Honor core.sharedrepository when receiving and adding files in direct + mode. + + -- Joey Hess <joeyh@debian.org> Tue, 03 Sep 2013 14:31:45 -0400 + git-annex (4.20130827) unstable; urgency=low * Youtube support! (And 53 other video hosts). When quvi is installed, @@ -25,8 +34,6 @@ git-annex (4.20130827) unstable; urgency=low * Debian: Run the builtin test suite as an autopkgtest. * Debian: Recommend ssh-askpass, which ssh will use when the assistant is run w/o a tty. Closes: #719832 - * Honor core.sharedrepository when receiving and adding files in direct - mode. -- Joey Hess <joeyh@debian.org> Tue, 27 Aug 2013 11:03:00 -0400 |