aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Commands
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2020-01-13 09:13:27 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2020-01-13 09:13:27 +0900
commit94c85073d1ec6ab111efd2dc6d036d00995cabaa (patch)
tree3004c08c04d1204707deef485a1cf5000efaffd5 /Mailman/Commands
parentbfb97f9086b505020158225cfab9964bb4b88f35 (diff)
parent6dc4f98f42535c22a3805370c5d45706f40db37d (diff)
downloadmailman2-94c85073d1ec6ab111efd2dc6d036d00995cabaa.tar.gz
mailman2-94c85073d1ec6ab111efd2dc6d036d00995cabaa.tar.xz
mailman2-94c85073d1ec6ab111efd2dc6d036d00995cabaa.zip
merge lp:mailman/2.1 up to 1832 (2.1.30rc1)
Diffstat (limited to 'Mailman/Commands')
-rw-r--r--Mailman/Commands/cmd_subscribe.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Mailman/Commands/cmd_subscribe.py b/Mailman/Commands/cmd_subscribe.py
index abe8b762..098740c8 100644
--- a/Mailman/Commands/cmd_subscribe.py
+++ b/Mailman/Commands/cmd_subscribe.py
@@ -128,6 +128,10 @@ the email address you gave is insecure."""))
except Errors.MMAlreadyAMember:
res.results.append(_('You are already subscribed!'))
return STOP
+ except Errors.MMAlreadyPending:
+ res.results.append(
+ _('You already have a subscription pending confirmation'))
+ return STOP
except Errors.MMCantDigestError:
res.results.append(
_('No one can subscribe to the digest of this list!'))