From 2f541d797e1a2dfd80dcae7b0548451317cabce1 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 27 Feb 2024 16:55:50 -0300
Subject: [PATCH] Ignore more settings

---
 export_mailman2_settings.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/export_mailman2_settings.py b/export_mailman2_settings.py
index ce35245..ff0adf6 100644
--- a/export_mailman2_settings.py
+++ b/export_mailman2_settings.py
@@ -41,7 +41,16 @@ EXCLUDES = set((
     '_new_volume',
     '_send_digest_now',
     'umbrella_list',
-    'umbrella_member_suffix'
+    'umbrella_member_suffix',
+    'send_reminders',
+    'admin_member_chunksize',
+    'host_name',
+    'new_member_options',
+    'include_sender_header',
+    'drop_cc',
+    'available_languages',
+    'encode_ascii_prefixes',
+    'regular_exclude_lists'
 ))
 
 
@@ -150,11 +159,12 @@ if __name__ == "__main__":
         globalconfig['dmarc_mitigate_action'] = dmarc_action_mapping(
             globalconfig.get('from_is_list', 0)).name
         globalconfig['dmarc_mitigate_unconditionally'] = True
-        del globalconfig['from_is_list']
     else:
         globalconfig['dmarc_mitigate_action'] = dmarc_action_mapping(
             globalconfig.get('dmarc_moderation_action', 0)).name
         globalconfig['dmarc_mitigate_unconditionally'] = False
+    if 'from_is_list' in globalconfig.keys():
+        del globalconfig['from_is_list']
     # Handle the archiving policy.  In MM2.1 there were two boolean options
     # but only three of the four possible states were valid.  Now there's just
     # an enum.