------------------------------------------------------------
revno: 1573
fixes bug: https://launchpad.net/bugs/1486263
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Tue 2015-08-18 14:58:02 -0700
message:
Fixed cron/gate_news to catch EOFError on opening the newsgroup.
modified:
NEWS
cron/gate_news
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription
=== modified file 'NEWS'
--- NEWS 2015-08-14 02:05:52 +0000
+++ NEWS 2015-08-18 21:58:02 +0000
@@ -14,6 +14,9 @@
Bug fixes and other patches
+ - Fixed cron/gate_news to catch EOFError on opening the newsgroup.
+ (LP: #1486263)
+
- Fixed a bug where a delayed probe bounce can throw an AttributeError.
(LP: #1482940)
=== modified file 'cron/gate_news'
--- cron/gate_news 2011-02-17 23:27:08 +0000
+++ cron/gate_news 2015-08-18 21:58:02 +0000
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -101,7 +101,7 @@
readermode=True,
user=mm_cfg.NNTP_USERNAME,
password=mm_cfg.NNTP_PASSWORD)
- except (socket.error, nntplib.NNTPError, IOError), e:
+ except (socket.error, nntplib.NNTPError, IOError, EOFError), e:
syslog('fromusenet',
'error opening connection to nntp_host: %s\n%s',
mlist.nntp_host, e)
@@ -212,7 +212,7 @@
# Open the newsgroup, but let most exceptions percolate up.
try:
conn, first, last = open_newsgroup(mlist)
- except (socket.error, nntplib.NNTPError), e:
+ except (socket.error, nntplib.NNTPError, IOError, EOFError), e:
syslog('fromusenet',
"%s: couldn't open newsgroup %s: skipping\n%s",
listname, mlist.linked_newsgroup, e)
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
