Catch the NotAMemberError exception thrown if an authenticated

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

2 files changed, 11 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()
diff --git a/NEWS b/NEWS
index 6ce009f6..e31fcb27 100755
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,10 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - We now catch the NotAMemberError exception thrown if an authenticated
+      unsubscribe is submitted from the user options page for a nonmember.
+      (LP: #1390653)
+
     - Fixed an archiving bug that would cause messages with 'Subject: Re:'
       only to be indexed in the archives without a link to the message.
       (LP: #1388614)