[Checkins] SVN: zope.sendmail/branches/3.7/ Ensure that 'queuedDelivery' directive conflicts with 'directDelivery'
Tres Seaver
cvs-admin at zope.org
Wed May 23 13:20:15 UTC 2012
Log message for revision 126456:
Ensure that 'queuedDelivery' directive conflicts with 'directDelivery'
The two are mutually incompatible.
See: https://bugs.launchpad.net/zope.sendmail/+bug/191143
Changed:
U zope.sendmail/branches/3.7/CHANGES.txt
U zope.sendmail/branches/3.7/src/zope/sendmail/zcml.py
-=-
Modified: zope.sendmail/branches/3.7/CHANGES.txt
===================================================================
--- zope.sendmail/branches/3.7/CHANGES.txt 2012-05-23 12:38:12 UTC (rev 126455)
+++ zope.sendmail/branches/3.7/CHANGES.txt 2012-05-23 13:20:12 UTC (rev 126456)
@@ -5,6 +5,10 @@
3.7.5 (unreleased)
------------------
+- Ensured that the 'queuedDelivery' directive has the same discriminator
+ as the 'directDelivery' directive (they are mutually incompatible).
+ https://bugs.launchpad.net/zope.sendmail/+bug/191143
+
- Avoid requeuing messages after an SMTP "recipients refused" error.
https://bugs.launchpad.net/zope.sendmail/+bug/1003288
Modified: zope.sendmail/branches/3.7/src/zope/sendmail/zcml.py
===================================================================
--- zope.sendmail/branches/3.7/src/zope/sendmail/zcml.py 2012-05-23 12:38:12 UTC (rev 126455)
+++ zope.sendmail/branches/3.7/src/zope/sendmail/zcml.py 2012-05-23 13:20:12 UTC (rev 126456)
@@ -105,7 +105,7 @@
thread.start()
_context.action(
- discriminator = ('delivery', name),
+ discriminator = ('utility', IMailDelivery, name),
callable = createQueuedDelivery,
args = () )
More information about the checkins
mailing list