Revision: 8104
http://svn.sourceforge.net/mailman/?rev=8104&view=rev
Author: tkikuchi
Date: 2006-12-03 00:06:45 -0800 (Sun, 03 Dec 2006)
Log Message:
-----------
A little more internal_name() to fqdn_listname changes.
Modified Paths:
--------------
trunk/mailman/Mailman/Archiver/Archiver.py
trunk/mailman/Mailman/Archiver/HyperArch.py
Modified: trunk/mailman/Mailman/Archiver/Archiver.py
===================================================================
--- trunk/mailman/Mailman/Archiver/Archiver.py 2006-12-03 00:22:17 UTC (rev
8103)
+++ trunk/mailman/Mailman/Archiver/Archiver.py 2006-12-03 08:06:45 UTC (rev
8104)
@@ -133,7 +133,7 @@
def ArchiveFileName(self):
"""The mbox name where messages are left for archive construction."""
return os.path.join(self.archive_dir() + '.mbox',
- self.internal_name() + '.mbox')
+ self.fqdn_listname + '.mbox')
def GetBaseArchiveURL(self):
if self.archive_private:
@@ -141,7 +141,7 @@
else:
web_host = config.domains.get(self.host_name, self.host_name)
url = Template(config.PUBLIC_ARCHIVE_URL).safe_substitute(
- listname=self.internal_name(),
+ listname=self.fqdn_listname,
hostname=web_host,
fqdn_listname=self.fqdn_listname,
)
@@ -171,7 +171,7 @@
raise
def ExternalArchive(self, ar, txt):
- d = SafeDict({'listname': self.internal_name(),
+ d = SafeDict({'listname': self.fqdn_listname,
'hostname': self.host_name,
})
cmd = ar % d
Modified: trunk/mailman/Mailman/Archiver/HyperArch.py
===================================================================
--- trunk/mailman/Mailman/Archiver/HyperArch.py 2006-12-03 00:22:17 UTC (rev
8103)
+++ trunk/mailman/Mailman/Archiver/HyperArch.py 2006-12-03 08:06:45 UTC (rev
8104)
@@ -184,7 +184,7 @@
if mlist is None:
listname = ''
else:
- listname = mlist._internal_name
+ listname = mlist.fqdn_listname
if lang is None:
if mlist is None:
lang = mm_cfg.DEFAULT_SERVER_LANGUAGE
@@ -345,7 +345,7 @@
else:
mlist = None
if mlist:
- d['__listname'] = self._mlist.internal_name()
+ d['__listname'] = self._mlist.fqdn_listname
else:
d['__listname'] = None
# Delete a few other things we don't want in the pickle
@@ -741,7 +741,7 @@
def html_TOC(self):
mlist = self.maillist
- listname = mlist.internal_name()
+ listname = mlist.fqdn_listname
mbox = os.path.join(mlist.archive_dir()+'.mbox', listname+'.mbox')
d = {"listname": mlist.real_name,
"listinfo": mlist.GetScriptURL('listinfo', absolute=1),
@@ -823,7 +823,7 @@
return 1
self._lock_file = LockFile.LockFile(
os.path.join(mm_cfg.LOCK_DIR,
- self.maillist.internal_name() + '-arch.lock'))
+ self.maillist.fqdn_listname + '-arch.lock'))
try:
self._lock_file.lock(timeout=0.5)
except LockFile.TimeOutError:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
