Forward-port fix for lp:191143 from the 3.7 branch.

zopefoundation · May 23, 2012 · 90d3fd3 · 90d3fd3
1 parent 699aabc
commit 90d3fd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,10 @@ CHANGES
 4.0.0 (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
 

diff --git a/src/zope/sendmail/zcml.py b/src/zope/sendmail/zcml.py
@@ -103,7 +103,7 @@ def createQueuedDelivery():
             thread.start()
 
     _context.action(
-            discriminator = ('delivery', name),
+            discriminator = ('utility', IMailDelivery, name),
             callable = createQueuedDelivery,
             args = () )