This commit is contained in:
2020-03-01 22:22:04 +01:00
parent 65d5dcf137
commit c7a027a4d8
2 changed files with 4 additions and 5 deletions

View File

@@ -612,7 +612,7 @@ def setup_milter(test=False, cfg_files=[]):
if "global" not in parser.sections(): if "global" not in parser.sections():
raise RuntimeError( raise RuntimeError(
"mandatory section 'global' not present in config file") "mandatory section 'global' not present in config file")
for option in ["quarantines", "preferred_action"]: for option in ["quarantines", "preferred_quarantine_action"]:
if not parser.has_option("global", option): if not parser.has_option("global", option):
raise RuntimeError( raise RuntimeError(
f"mandatory option '{option}' not present in config " f"mandatory option '{option}' not present in config "

View File

@@ -200,10 +200,9 @@ class EMailNotification(BaseNotification):
self.replacement_img = None self.replacement_img = None
# read images to embed if specified # read images to embed if specified
embedded_img_paths = [] embedded_img_paths = [
for p in cfg["notification_email_embedded_imgs"].split(","): p.strip() for p in cfg["notification_email_embedded_imgs"].split(
if p: ",") if p]
embedded_img_paths.append(p.strip())
self.embedded_imgs = [] self.embedded_imgs = []
for img_path in embedded_img_paths: for img_path in embedded_img_paths:
# read image # read image