diff options
| -rwxr-xr-x | NEWS | 3 | ||||
| -rwxr-xr-x | cron/gate_news | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -14,6 +14,9 @@ Here is a history of user visible changes to Mailman. 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) diff --git a/cron/gate_news b/cron/gate_news index c66c09e0..8b6476a3 100755 --- a/cron/gate_news +++ b/cron/gate_news @@ -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 @@ def open_newsgroup(mlist): 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 @@ def process_lists(glock): # 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) |