diff options
| author | Mark Sapiro <mark@msapiro.net> | 2020-05-18 10:01:51 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2020-05-18 10:01:51 -0700 |
| commit | 248ca38ffb4821a131460c9953aa21d6fe7cec04 (patch) | |
| tree | 0a9506f5eb6cf8ca369f3a18aa3e8be69c4d80f4 /Mailman/Cgi | |
| parent | 6432a3277d824ce149cf0d105bab6b78a91821a4 (diff) | |
| download | mailman2-248ca38ffb4821a131460c9953aa21d6fe7cec04.tar.gz mailman2-248ca38ffb4821a131460c9953aa21d6fe7cec04.tar.xz mailman2-248ca38ffb4821a131460c9953aa21d6fe7cec04.zip | |
Extend REFUSE_SECOND_PENDING to unsubscription as well.
Diffstat (limited to 'Mailman/Cgi')
| -rw-r--r-- | Mailman/Cgi/options.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index ee2293e2..1037f8f9 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -206,6 +206,7 @@ def main(): # Are we processing an unsubscription request from the login screen? msgc = _('If you are a list member, a confirmation email has been sent.') + msgb = _('You already have a subscription pending confirmation') msga = _("""If you are a list member, your unsubscription request has been forwarded to the list administrator for approval.""") if cgidata.has_key('login-unsub'): @@ -228,6 +229,8 @@ def main(): mlist.ConfirmUnsubscription(user, userlang, remote=ip) doc.addError(msgc, tag='') mlist.Save() + except Errors.MMAlreadyPending: + doc.addError(msgb) finally: mlist.Unlock() else: |