Fix for (tracker) bug #222409: don't barf when approving a subscription of

someone who is already on the list. Since the person was added between the
subscription request and the approval, just drop the request.

1 files changed, 7 insertions, 3 deletions

diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py
index b4503b910..9546031d6 100644
--- a/Mailman/ListAdmin.py
+++ b/Mailman/ListAdmin.py
@@ -350,9 +350,13 @@ class ListAdmin:
         else:
             # subscribe
             assert value == mm_cfg.SUBSCRIBE
-            self.ApprovedAddMember(addr, password, digest, lang)
-            # TBD: disgusting hack: ApprovedAddMember() can end up closing the
-            # request database.
+            try:
+                self.ApprovedAddMember(addr, password, digest, lang)
+            except Errors.MMAlreadyMember:
+                # User has already been subscribed, after sending the request
+                pass
+            # TBD: disgusting hack: ApprovedAddMember() can end up closing
+            # the request database.
             self.__opendb()
         return REMOVE