------------------------------------------------------------
revno: 1709
fixes bug: https://launchpad.net/bugs/1695610
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.1
timestamp: Sat 2017-06-03 13:33:49 -0700
message:
Fixed the -V option to list_lists to not show subdomains.
modified:
NEWS
bin/list_lists
--
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 2017-06-02 22:25:12 +0000
+++ NEWS 2017-06-03 20:33:49 +0000
@@ -5,6 +5,13 @@
Here is a history of user visible changes to Mailman.
+2.1.25 (xx-xxx-xxxx)
+
+ Bug fixes and other patches
+
+ - Fixed the -V option to bin/list_lists to not show lists whose host is a
+ subdomain of the given domain. (LP: #1695610)
+
2.1.24 (02-Jun-2017)
Security
=== modified file 'bin/list_lists'
--- bin/list_lists 2016-05-17 20:20:08 +0000
+++ bin/list_lists 2017-06-03 20:33:49 +0000
@@ -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 @@
"""
+import re
import sys
import getopt
import paths
@@ -106,9 +107,10 @@
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)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
