From e50a523bdffd3968ab95dec828c01dafa79824e1 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Sat, 29 Dec 2001 21:30:27 +0000
Subject: main(): The last fix wasn't correct; it should have been fixed in
 OldStyleMemberships.py.  Backing it out.

---
 Mailman/Cgi/admin.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'Mailman/Cgi/admin.py')

diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index b8aeae7b5..4f7a2767c 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -159,12 +159,7 @@ def main():
 
         if cgidata.keys():
             # There are options to change
-            try:
-                change_options(mlist, category, subcat, cgidata, doc)
-            except Errors.NotAMemberError:
-                # We're unsubscribing /and/ changing an option.  Just ignore
-                # the option change.
-                pass
+            change_options(mlist, category, subcat, cgidata, doc)
             # Let the list sanity check the changed values
             mlist.CheckValues()
         # Additional sanity checks
-- 
cgit v1.2.3-70-g09d2