diff options
| author | bwarsaw | 2006-09-25 00:01:06 +0000 |
|---|---|---|
| committer | bwarsaw | 2006-09-25 00:01:06 +0000 |
| commit | 8157935353a960cd03a72e403e8638b016c8e9a1 (patch) | |
| tree | 00e219530cab575a9d2ec76ee9c90523d14a5275 /Mailman/MailList.py | |
| parent | 99a4f0ef16e6dfddafbd396896afb97821528f16 (diff) | |
| download | mailman-8157935353a960cd03a72e403e8638b016c8e9a1.tar.gz mailman-8157935353a960cd03a72e403e8638b016c8e9a1.tar.zst mailman-8157935353a960cd03a72e403e8638b016c8e9a1.zip | |
Convert genaliases to mmshell, optparse, and configuration.config
bin/withlist: If there's no '@' in the listname, append the DEFAULT_EMAIL_HOST
so we always get a fully qualified list name.
bin/mmsitepass: plumb through -C/--config switch and be sure to call
config.load().
Convert Mailman/MTA/Postfix.py to configuration.config, and update MTA/Manual.
In mailman/Cgi/create, we can't convert straight from a string to a bool,
because bool('0') is True. We need to go through int first.
MailList.InitTempVars(): The logic here looked weird because we could get
'name' = None and that would break. Assume name is never None.
Diffstat (limited to 'Mailman/MailList.py')
| -rw-r--r-- | Mailman/MailList.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py index 89ace8565..9fa5806de 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -286,15 +286,14 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, os.path.join(config.LOCK_DIR, name or '<site>') + '.lock', lifetime=config.LIST_LOCK_LIFETIME) # XXX FIXME Sometimes name is fully qualified, sometimes it's not. - if name and '@' in name: + if '@' in name: self._internal_name, self.host_name = name.split('@', 1) + self._full_path = os.path.join(config.LIST_DATA_DIR, name) else: self._internal_name = name self.host_name = config.DEFAULT_EMAIL_HOST - if name: - self._full_path = os.path.join(config.LIST_DATA_DIR, name) - else: - self._full_path = '' + self._full_path = os.path.join(config.LIST_DATA_DIR, + self.host_name + '@' + name) # Only one level of mixin inheritance allowed for baseclass in self.__class__.__bases__: if hasattr(baseclass, 'InitTempVars'): |
