aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbwarsaw <>2003-12-01 01:25:46 +0000
committerbwarsaw <>2003-12-01 01:25:46 +0000
commit58b386710a20d779fe03cd16a61ca55ce065c6b6 (patch)
tree2a7a3051f261f05fd854b5052f1689453538c8c1
parent629d7d060dcc9418cc6cc9613b6f449b31043a39 (diff)
downloadmailman2-58b386710a20d779fe03cd16a61ca55ce065c6b6.tar.gz
mailman2-58b386710a20d779fe03cd16a61ca55ce065c6b6.tar.xz
mailman2-58b386710a20d779fe03cd16a61ca55ce065c6b6.zip
process(): Catch MMBadPasswordError which gets thrown by ProcessConfirmation()
when the wrong admin password is given in a confirmation message.
-rw-r--r--Mailman/Commands/cmd_confirm.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Mailman/Commands/cmd_confirm.py b/Mailman/Commands/cmd_confirm.py
index e66c52b5..844b4128 100644
--- a/Mailman/Commands/cmd_confirm.py
+++ b/Mailman/Commands/cmd_confirm.py
@@ -67,6 +67,9 @@ your email address?"""))
res.results.append(_("""\
You were not invited to this mailing list. The invitation has been discarded,
and both list administrators have been alerted."""))
+ except Errors.MMBadPasswordError:
+ res.results.append(_("""\
+Bad approval password given. Held message is still being held."""))
else:
if ((results[0] == Pending.SUBSCRIPTION and mlist.send_welcome_msg)
or