summaryrefslogtreecommitdiff
path: root/src/mailman/utilities/importer.py
diff options
context:
space:
mode:
authorAurélien Bompard2015-09-12 13:20:58 +0200
committerBarry Warsaw2015-10-20 21:10:35 -0400
commitb9baf43abd023b74d92aa0efa31b45d97111394a (patch)
treec9ab7e4b014d380e2ac41a66f92e6a314c96194d /src/mailman/utilities/importer.py
parentd468d096b35e42f8450a5ae449501ea155992a95 (diff)
downloadmailman-b9baf43abd023b74d92aa0efa31b45d97111394a.tar.gz
mailman-b9baf43abd023b74d92aa0efa31b45d97111394a.tar.zst
mailman-b9baf43abd023b74d92aa0efa31b45d97111394a.zip
Diffstat (limited to 'src/mailman/utilities/importer.py')
-rw-r--r--src/mailman/utilities/importer.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index 1261823fd..f767ddbe3 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -27,8 +27,8 @@ import os
import re
import sys
import codecs
-import datetime
import logging
+import datetime
from mailman.config import config
from mailman.core.errors import MailmanError
@@ -39,8 +39,8 @@ from mailman.interfaces.archiver import ArchivePolicy
from mailman.interfaces.autorespond import ResponseAction
from mailman.interfaces.bans import IBanManager
from mailman.interfaces.bounce import UnrecognizedBounceDisposition
-from mailman.interfaces.digests import DigestFrequency
from mailman.interfaces.chain import LinkAction
+from mailman.interfaces.digests import DigestFrequency
from mailman.interfaces.languages import ILanguageManager
from mailman.interfaces.mailinglist import IAcceptableAliasSet
from mailman.interfaces.mailinglist import Personalization, ReplyToMunging
@@ -335,9 +335,14 @@ def import_config_pck(mlist, config_dict):
# expression. Make that explicit for MM3.
alias_set.add('^' + address)
# Handle header_filter_rules conversion to header_matches
- for line_patterns, action, _unused in \
- config_dict.get('header_filter_rules', []):
- chain = action_to_chain(action)
+ header_filter_rules = config_dict.get('header_filter_rules', [])
+ for line_patterns, action, _unused in header_filter_rules:
+ try:
+ chain = action_to_chain(action)
+ except KeyError:
+ log.warning('Unsupported header_filter_rules action: %r',
+ action)
+ continue
# now split the pattern in a header and a pattern
for line_pattern in line_patterns.splitlines():
if not line_pattern.strip():