Changed dump option to not have a email list association.

manage_members.py

@@ -62,7 +62,7 @@ def restore_members( members_file, ml_fqdn, scrub ):
                     #deletes all members in the list
                     if ( scrub ):
                         scrub_members( ml_fqdn )
-                    tgt_list = client.get_list(src_member['list_fqdn'])
+                    tgt_list = client.get_list(ml_fqdn)
                     # Get members from the current email list
                     tgt_members = [str(tgt_member.email) for tgt_member in tgt_list.members]
 
@@ -81,9 +81,9 @@ def restore_members( members_file, ml_fqdn, scrub ):
                                            pre_confirmed=True,
                                            pre_approved=True)
 
-                        # set the preferences
-                        set_preferences(src_member['preferences'],
-                                      tgt_list.get_member(src_member['email']).preferences)
+                    # set the preferences
+                    set_preferences(src_member['preferences'],
+                                    tgt_list.get_member(src_member['email']).preferences)
                 else:
                     print("Error: Email List "+ml_fqdn+" does not match with data file"+src_member['list_fqdn'])
 
@@ -123,14 +123,12 @@ if __name__ == '__main__':
                               'http://mailman-core:8001/3.1')
     CORE_USER = os.environ.get('MAILMAN_REST_USER', 'restadmin')
     CORE_PASS = os.environ.get('MAILMAN_REST_PASSWORD', 'restpass')
-    # Default Email list
-    LIST_NAME = 'apachesvn@lists.med.stanford.edu'
 
     # user invoked variables
     parser.add_argument('-l','--list-fqdn', required=True, help='Required Mailing List')
     parser.add_argument('-d','--dump',action='store_true',
     help='Dumps a mailing list to stout in json format.')
-    parser.add_argument('-r','--restore',
+    parser.add_argument('-r','--restore',action='store_true',
     help='Subscribes users from a source email list into a tareget email list if not already added.')
     parser.add_argument('-s','--scrub',action='store_true',
     help='Removes all users from a target email list and suscribes the current.')