summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2001-11-20 16:26:33 +0000
committerbwarsaw2001-11-20 16:26:33 +0000
commitce41a091f5fe0271bcce88e6dbf2346e9057683b (patch)
treee1ad4ddff7260940ad3ebb3b77de306878e49edc
parent8f5694e541419427bcf6bcad383659c28fdbbeb1 (diff)
downloadmailman-ce41a091f5fe0271bcce88e6dbf2346e9057683b.tar.gz
mailman-ce41a091f5fe0271bcce88e6dbf2346e9057683b.tar.zst
mailman-ce41a091f5fe0271bcce88e6dbf2346e9057683b.zip
-rw-r--r--Mailman/Utils.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index fae83970d..ccaff76bb 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -637,10 +637,12 @@ def get_domain():
return mm_cfg.DEFAULT_HOST_NAME.lower()
-def get_site_email(hostname=None, extra=''):
+def get_site_email(hostname=None, extra=None):
if hostname is None:
hostname = mm_cfg.VIRTUAL_HOSTS.get(get_domain(), get_domain())
- return '%s%s@%s' % (mm_cfg.MAILMAN_SITE_LIST, extra, hostname)
+ if extra is None:
+ return '%s@%s' % (mm_cfg.MAILMAN_SITE_LIST, hostname)
+ return '%s-%s@%s' % (mm_cfg.MAILMAN_SITE_LIST, extra, hostname)