diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-04-11 18:36:40 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2018-04-11 18:36:40 +0900 |
| commit | 4adcb27774066835546919d127c0ee341bb00208 (patch) | |
| tree | 30011132a9664c343e05108de05413fefae2914b /Mailman/MailList.py | |
| parent | 21794803f456989ecdcafbe9cb395885ee24becb (diff) | |
| parent | a942e159e5c738072efa8fa8c4d7c76cc35a7db5 (diff) | |
| download | mailman2-4adcb27774066835546919d127c0ee341bb00208.tar.gz mailman2-4adcb27774066835546919d127c0ee341bb00208.tar.xz mailman2-4adcb27774066835546919d127c0ee341bb00208.zip | |
merge lp:mailman/2.1 up to rev 1750
Diffstat (limited to 'Mailman/MailList.py')
| -rwxr-xr-x | Mailman/MailList.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index d1dc17a4..619c3206 100755 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2018 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 @@ -784,8 +784,16 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, self.reply_to_address = '' self.reply_goes_to_list = 0 # Legacy topics may have bad regular expressions in their patterns + # Also, someone may have broken topics with, e.g., config_list. goodtopics = [] - for name, pattern, desc, emptyflag in self.topics: + for value in self.topics: + try: + name, pattern, desc, emptyflag = value + except ValueError: + # This value is not a 4-tuple. Just log and drop it. + syslog('error', 'Bad topic "%s" for list: %s', + value, self.internal_name()) + continue try: orpattern = OR.join(pattern.splitlines()) re.compile(orpattern) |