diff options
| -rw-r--r-- | Mailman/Archiver/Archiver.py | 7 | ||||
| -rw-r--r-- | Mailman/Archiver/HyperArch.py | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Mailman/Archiver/Archiver.py b/Mailman/Archiver/Archiver.py index b80ffdbef..65cf1c535 100644 --- a/Mailman/Archiver/Archiver.py +++ b/Mailman/Archiver/Archiver.py @@ -31,6 +31,7 @@ from cStringIO import StringIO from Mailman import mm_cfg from Mailman import Mailbox from Mailman import Utils +from Mailman import Site from Mailman.SafeDict import SafeDict from Mailman.Logging.Syslog import syslog from Mailman.i18n import _ @@ -111,8 +112,7 @@ class Archiver: os.umask(omask) def archive_dir(self): - return os.path.join(mm_cfg.PRIVATE_ARCHIVE_FILE_DIR, - self.internal_name()) + return Site.get_archpath(self.internal_name()) def ArchiveFileName(self): """The mbox name where messages are left for archive construction.""" @@ -217,8 +217,7 @@ class Archiver: if mm_cfg.ARCHIVE_TO_MBOX == -1: # Archiving is completely disabled, don't require the skeleton. return - pubdir = os.path.join(mm_cfg.PUBLIC_ARCHIVE_FILE_DIR, - self.internal_name()) + pubdir = Site.get_archpath(self.internal_name(), public=1) privdir = self.archive_dir() pubmbox = pubdir + '.mbox' privmbox = privdir + '.mbox' diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py index 647e40747..a2b0d41bb 100644 --- a/Mailman/Archiver/HyperArch.py +++ b/Mailman/Archiver/HyperArch.py @@ -614,9 +614,7 @@ class HyperArchive(pipermail.T): def html_TOC_entry(self, arch): # Check to see if the archive is gzip'd or not - txtfile = os.path.join(mm_cfg.PRIVATE_ARCHIVE_FILE_DIR, - self.maillist.internal_name(), - arch + '.txt') + txtfile = os.path.join(self.maillist.archive_dir(), arch + '.txt') gzfile = txtfile + '.gz' templ = '<td><A href="%(url)s">[ %(fmt)sText%(sz)s]</a></td>' # which exists? .txt.gz first, then .txt |