diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-05-18 05:20:08 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-05-18 05:20:08 +0900 |
| commit | 830e3cc518913b2d2012a9756ef1cccf59efc3a9 (patch) | |
| tree | 2648211d357d2d67afc6389fb824cee7c3a479d2 /Mailman | |
| parent | 5470c21a0348e7bbc95543af762747417260cb10 (diff) | |
| parent | 686cd52aa51e7a01a321ef83581b75c3de0efc55 (diff) | |
| download | mailman2-830e3cc518913b2d2012a9756ef1cccf59efc3a9.tar.gz mailman2-830e3cc518913b2d2012a9756ef1cccf59efc3a9.tar.xz mailman2-830e3cc518913b2d2012a9756ef1cccf59efc3a9.zip | |
Merge lp:mailman/2.1 rev 1651
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Cgi/admin.py | 6 | ||||
| -rw-r--r-- | Mailman/Cgi/listinfo.py | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py index 370a2507..a939c88a 100644 --- a/Mailman/Cgi/admin.py +++ b/Mailman/Cgi/admin.py @@ -260,7 +260,11 @@ def admin_overview(msg=''): listnames.sort() for name in listnames: - mlist = MailList.MailList(name, lock=0) + try: + mlist = MailList.MailList(name, lock=0) + except Errors.MMUnknownListError: + # The list could have been deleted by another process. + continue if mlist.advertised: if mm_cfg.VIRTUAL_HOST_OVERVIEW and ( mlist.web_page_url.find('/%s/' % hostname) == -1 and diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py index c13fdb26..b07e2201 100644 --- a/Mailman/Cgi/listinfo.py +++ b/Mailman/Cgi/listinfo.py @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2015 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2016 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 @@ -88,7 +88,11 @@ def listinfo_overview(msg=''): listnames.sort() for name in listnames: - mlist = MailList.MailList(name, lock=0) + try: + mlist = MailList.MailList(name, lock=0) + except Errors.MMUnknownListError: + # The list could have been deleted by another process. + continue if mlist.advertised: if mm_cfg.VIRTUAL_HOST_OVERVIEW and ( mlist.web_page_url.find('/%s/' % hostname) == -1 and |