diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2017-06-10 18:43:50 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2017-06-10 18:43:50 +0900 |
| commit | ae4c93087ddb0273f5c5205ef69fed5ae71221d4 (patch) | |
| tree | 3b1721b212b41df13eddfcd68a1997861944b33e /bin/list_lists | |
| parent | ec87166d9d23a54701af5cc2e4c8f18df399bf14 (diff) | |
| parent | 4836d8978d0b42b6a361c6a98962aec185e60023 (diff) | |
| download | mailman2-ae4c93087ddb0273f5c5205ef69fed5ae71221d4.tar.gz mailman2-ae4c93087ddb0273f5c5205ef69fed5ae71221d4.tar.xz mailman2-ae4c93087ddb0273f5c5205ef69fed5ae71221d4.zip | |
Merge lp:mailman/2.1 up to 1716
Diffstat (limited to 'bin/list_lists')
| -rw-r--r-- | bin/list_lists | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/list_lists b/bin/list_lists index 4a546885..a6824c31 100644 --- a/bin/list_lists +++ b/bin/list_lists @@ -1,6 +1,6 @@ #! @PYTHON@ # -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2017 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 @@ -42,6 +42,7 @@ Where: """ +import re import sys import getopt import paths @@ -106,9 +107,10 @@ def main(): continue if public and mlist.archive_private: continue - if vhost and mm_cfg.VIRTUAL_HOST_OVERVIEW and \ - vhost.find(mlist.web_page_url) == -1 and \ - mlist.web_page_url.find(vhost) == -1: + if (vhost and mm_cfg.VIRTUAL_HOST_OVERVIEW and + not re.search('://%s/' % re.escape(vhost), + mlist.web_page_url, + re.IGNORECASE)): continue mlists.append(mlist) longest = max(len(mlist.real_name), longest) |