summaryrefslogtreecommitdiff
path: root/src/mailman/mta/deliver.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/mta/deliver.py')
-rw-r--r--src/mailman/mta/deliver.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mailman/mta/deliver.py b/src/mailman/mta/deliver.py
index 4783296cf..1d7f727ae 100644
--- a/src/mailman/mta/deliver.py
+++ b/src/mailman/mta/deliver.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010 by the Free Software Foundation, Inc.
+# Copyright (C) 2009-2011 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -28,8 +28,6 @@ __all__ = [
import time
import logging
-from lazr.config import as_boolean
-
from mailman.config import config
from mailman.interfaces.mailinglist import Personalization
from mailman.interfaces.mta import SomeRecipientsFailed
@@ -150,9 +148,9 @@ def deliver(mlist, msg, msgdata):
template = config.logging.smtp.failure
if template.lower() != 'no':
substitutions.update(
- recip = recip,
+ recip = recipient,
smtpcode = code,
- smtpmsg = smtpmsg,
+ smtpmsg = smtp_message,
)
log.info('%s', expand(template, substitutions))
# Return the results