------------------------------------------------------------
revno: 1241
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Wed 2010-06-23 21:09:34 -0700
message:
  Fixed a bug which would fail to show a list on the admin and listinfo
  overview pages if its web_page_url contained a :port.  Bug # 597741.
modified:
  Mailman/Cgi/admin.py
  Mailman/Cgi/listinfo.py
  NEWS


--
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 'Mailman/Cgi/admin.py'
--- Mailman/Cgi/admin.py	2010-03-29 20:48:11 +0000
+++ Mailman/Cgi/admin.py	2010-06-24 04:09:34 +0000
@@ -233,8 +233,9 @@
     for name in listnames:
         mlist = MailList.MailList(name, lock=0)
         if mlist.advertised:
-            if mm_cfg.VIRTUAL_HOST_OVERVIEW and \
-                   mlist.web_page_url.find('/%s/' % hostname) == -1:
+            if mm_cfg.VIRTUAL_HOST_OVERVIEW and (
+                   mlist.web_page_url.find('/%s/' % hostname) == -1 and
+                   mlist.web_page_url.find('/%s:' % hostname) == -1):
                 # List is for different identity of this host - skip it.
                 continue
             else:

=== modified file 'Mailman/Cgi/listinfo.py'
--- Mailman/Cgi/listinfo.py	2010-03-29 20:48:11 +0000
+++ Mailman/Cgi/listinfo.py	2010-06-24 04:09:34 +0000
@@ -89,8 +89,9 @@
     for name in listnames:
         mlist = MailList.MailList(name, lock=0)
         if mlist.advertised:
-            if mm_cfg.VIRTUAL_HOST_OVERVIEW and \
-                   mlist.web_page_url.find('/%s/' % hostname) == -1:
+            if mm_cfg.VIRTUAL_HOST_OVERVIEW and (
+                   mlist.web_page_url.find('/%s/' % hostname) == -1 and
+                   mlist.web_page_url.find('/%s:' % hostname) == -1):
                 # List is for different identity of this host - skip it.
                 continue
             else:

=== modified file 'NEWS'
--- NEWS	2010-05-30 21:16:01 +0000
+++ NEWS	2010-06-24 04:09:34 +0000
@@ -17,6 +17,9 @@
 
   Bug Fixes and other patches
 
+    - Fixed a bug which would fail to show a list on the admin and listinfo
+      overview pages if its web_page_url contained a :port.  Bug # 597741.
+
     - Fixed bin/genaliases to not throw TypeError when MTA = None.
       Bug #587657.
 

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to