summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mailman/Commands/cmd_subscribe.py3
-rw-r--r--Mailman/Commands/cmd_unsubscribe.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/Mailman/Commands/cmd_subscribe.py b/Mailman/Commands/cmd_subscribe.py
index de5ba73f8..1a5048d69 100644
--- a/Mailman/Commands/cmd_subscribe.py
+++ b/Mailman/Commands/cmd_subscribe.py
@@ -125,7 +125,8 @@ the email address you gave is insecure."""))
res.results.append(_('This list only supports digest subscriptions!'))
return STOP
except Errors.MMSubscribeNeedsConfirmation:
- res.results.append(_('A confirmation email has been sent separately.'))
+ # We don't need to respond /and/ send a confirmation message.
+ res.respond = 0
except Errors.MMNeedApproval:
res.results.append(_("""\
Your subscription request has been forwarded to the list administrator
diff --git a/Mailman/Commands/cmd_unsubscribe.py b/Mailman/Commands/cmd_unsubscribe.py
index d6139b1e6..c574a80f9 100644
--- a/Mailman/Commands/cmd_unsubscribe.py
+++ b/Mailman/Commands/cmd_unsubscribe.py
@@ -74,7 +74,8 @@ approval."""))
# instead of unsubscribing them here.
cpaddr = mlist.getMemberCPAddress(address)
mlist.ConfirmUnsubscription(cpaddr)
- res.results.append(_('A removal confirmation message has been sent.'))
+ # We don't also need to send a confirmation to this command
+ res.respond = 0
else:
# No admin approval is necessary, so we can just delete them if the
# passwords match.