From 58b386710a20d779fe03cd16a61ca55ce065c6b6 Mon Sep 17 00:00:00 2001
From: bwarsaw <>
Date: Mon, 1 Dec 2003 01:25:46 +0000
Subject: process(): Catch MMBadPasswordError which gets thrown by
 ProcessConfirmation() when the wrong admin password is given in a
 confirmation message.

---
 Mailman/Commands/cmd_confirm.py | 3 +++
 1 file changed, 3 insertions(+)

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
-- 
cgit v1.2.3