Ibid

Merge lp:~max-rabkin/ibid/empty-feed-661187-0.1 into lp:~ibid-core/ibid/old-release-0.1-1.6

  1. empty-feed-661187-0.1
  2. Merge into old-release-0.1-1.6
Proposed by Max Rabkin
Status: Merged
Approved by: Max Rabkin
Approved revision: 957
Merged at revision: 958
Proposed branch: lp:~max-rabkin/ibid/empty-feed-661187-0.1
Merge into: lp:~ibid-core/ibid/old-release-0.1-1.6
Diff against target: 20 lines (+1/-2)
1 file modified
ibid/plugins/feeds.py (+1/-2)
To merge this branch: bzr merge lp:~max-rabkin/ibid/empty-feed-661187-0.1
Reviewer Review Type Date Requested Status
marcog (community) Approve
Jonathan Hitchcock Approve
Stefano Rivera Approve
Review via email: mp+40307@code.launchpad.net

Commit message

Don't treat feeds with no messages as errors

Description of the change

Same patch as the one into trunk which was already approved.

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) :
review: Approve
Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve
Revision history for this message
marcog (marco-gallotta) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/feeds.py'
2--- ibid/plugins/feeds.py 2010-02-20 21:58:38 +0000
3+++ ibid/plugins/feeds.py 2010-11-08 08:26:14 +0000
4@@ -226,7 +226,7 @@
5
6 feed.update()
7 if not feed.entries:
8- event.addresponse(u"I can't access that feed")
9+ event.addresponse(u"I can't find any articles in that feed")
10 return
11
12 articles = feed.entries[start:number+start]
13@@ -291,7 +291,6 @@
14 for feed in feeds:
15 feed.update(max_age=self.interval)
16 if not feed.entries:
17- log.warning(u'Error polling feed %s', feed.name)
18 continue
19
20 if feed.name not in self.last_seen:

Subscribers

People subscribed via source and target branches