aboutsummaryrefslogtreecommitdiff
path: root/src/mailman_pgp/runners
diff options
context:
space:
mode:
authorJ08nY2017-06-27 00:34:19 +0200
committerJ08nY2017-06-27 00:34:19 +0200
commitb7e3366e385d603885360ba6550bcf04c4d7d878 (patch)
treeb34a45faadd9f8ca921cd17e05179aac8311238e /src/mailman_pgp/runners
parent016740a6ca2aa789713abdf9caadf9d102c8b866 (diff)
downloadmailman-pgp-b7e3366e385d603885360ba6550bcf04c4d7d878.tar.gz
mailman-pgp-b7e3366e385d603885360ba6550bcf04c4d7d878.tar.zst
mailman-pgp-b7e3366e385d603885360ba6550bcf04c4d7d878.zip
Diffstat (limited to 'src/mailman_pgp/runners')
-rw-r--r--src/mailman_pgp/runners/incoming.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mailman_pgp/runners/incoming.py b/src/mailman_pgp/runners/incoming.py
index b34f5e5..7bc14e1 100644
--- a/src/mailman_pgp/runners/incoming.py
+++ b/src/mailman_pgp/runners/incoming.py
@@ -20,6 +20,7 @@
from mailman.config import config as mailman_config
from mailman.core.runner import Runner
from mailman.email.message import Message
+from mailman.interfaces.action import Action
from mailman.model.mailinglist import MailingList
from public import public
@@ -59,7 +60,7 @@ class IncomingRunner(Runner):
# just set some data for our `encryption` rule which will
# jump to the moderation chain if `pgp_moderate` is True
action = pgp_list.nonencrypted_msg_action
- if action is not None:
+ if action != Action.defer:
msgdata['moderation_action'] = action
msgdata['moderation_sender'] = msg.sender
msgdata['moderation_reason'] = 'Message was not encrypted.'