Catch the NotAMemberError exception thrown if an authenticated

unsubscribe is submitted from the user options page for a nonmember.

1 files changed, 7 insertions, 0 deletions

diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py
index c1c08659..69ac52a9 100644
--- a/Mailman/Cgi/options.py
+++ b/Mailman/Cgi/options.py
@@ -518,6 +518,13 @@ address.  Upon confirmation, any other mailing list containing the address
                     user, 'via the member options page', userack=1)
             except Errors.MMNeedApproval:
                 needapproval = True
+            except Errors.NotAMemberError:
+                # MAS This except should really be in the outer try so we
+                # don't save the list redundantly, but except and finally in
+                # the same try requires Python >= 2.5.
+                # Setting a switch and making the Save() conditional doesn't
+                # seem worth it as the Save() won't change anything.
+                pass
             mlist.Save()
         finally:
             mlist.Unlock()