Update of /cvsroot/mailman/mailman/Mailman/Archiver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23288
Modified Files:
Tag: Release_2_1-maint
Archiver.py
Log Message:
[ 789015 ] Archiver.py patch for pipermail URL generation
Index: Archiver.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Archiver/Archiver.py,v
retrieving revision 2.28.2.2
retrieving revision 2.28.2.3
diff -u -d -r2.28.2.2 -r2.28.2.3
--- Archiver.py 1 Dec 2003 01:07:26 -0000 2.28.2.2
+++ Archiver.py 9 Oct 2004 00:41:44 -0000 2.28.2.3
@@ -25,6 +25,7 @@
import os
import errno
import traceback
+import re
from cStringIO import StringIO
from Mailman import mm_cfg
@@ -135,15 +136,15 @@
self.internal_name() + '.mbox')
def GetBaseArchiveURL(self):
+ url = self.GetScriptURL('private', absolute=1) + '/'
if self.archive_private:
- return self.GetScriptURL('private', absolute=1) + '/'
+ return url
else:
- inv = {}
- for k, v in mm_cfg.VIRTUAL_HOSTS.items():
- inv[v] = k
+ hostname = re.match('[^:]*://([^/]*)/.*', url).group(1)\
+ or mm_cfg.DEFAULT_URL_HOST
url = mm_cfg.PUBLIC_ARCHIVE_URL % {
'listname': self.internal_name(),
- 'hostname': inv.get(self.host_name, mm_cfg.DEFAULT_URL_HOST),
+ 'hostname': hostname
}
if not url.endswith('/'):
url += '/'
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
