Merge branch 'content-type-warning'
authorW. Trevor King <wking@tremily.us>
Sun, 28 Sep 2014 20:46:59 +0000 (13:46 -0700)
committerW. Trevor King <wking@tremily.us>
Sun, 28 Sep 2014 20:46:59 +0000 (13:46 -0700)
commita4b5ee45117584de0e86de571e3e0b6fba8faa9a
treec7c1c9344adf3235366b1ce6a9203792ceae5d93
parent3fb966d6eaff45d8b932e2c19aef91a76d30e006
parent1512c96808bc859784d13699d8c4fee13f5f482b
Merge branch 'content-type-warning'

A few folks have stumbled over this one, thinking that the error
message meant the feed wasn't parsed [1,2,3].  All we're actually
doing is passing along a feedparser warning, so adjust our prefix
accordingly and drop the level from ERROR to WARNING.  Hopefully this
makes it clearer that:

* We still process these feeds, despite the bozo exception.  If
  feedparser can parse the feed despite the exception, it will do so.
* We probably can't fix these issues in rss2email.  You need to fix
  them in the feed itself, or adjust feedparser to deal with the
  busted feed.

This merge pulls in:

* content-type-warning:
  CHANGELOG: Document this branch
  Log a warning when Content-Type is not correct

[1]: http://article.gmane.org/gmane.mail.rss2email/168
[2]: https://github.com/wking/rss2email/issues/37
[3]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760963

Reported-by: Arun Persaud <apersaud@lbl.gov>
Reported-by: Joey Hess <joeyh@debian.org>
Signed-off-by: W. Trevor King <wking@tremily.us>