[Checkins] SVN: zope.sendmail/trunk/ Forward-port fix for lp:191143 from the 3.7 branch.

[Tres Seaver]

Log message for revision 126457:
  Forward-port fix for lp:191143 from the 3.7 branch.

Changed:
  U   zope.sendmail/trunk/CHANGES.txt
  U   zope.sendmail/trunk/src/zope/sendmail/zcml.py

-=-
Modified: zope.sendmail/trunk/CHANGES.txt
===================================================================
--- zope.sendmail/trunk/CHANGES.txt	2012-05-23 13:20:12 UTC (rev 126456)
+++ zope.sendmail/trunk/CHANGES.txt	2012-05-23 13:22:33 UTC (rev 126457)
@@ -5,6 +5,10 @@
 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
 

Modified: zope.sendmail/trunk/src/zope/sendmail/zcml.py
===================================================================
--- zope.sendmail/trunk/src/zope/sendmail/zcml.py	2012-05-23 13:20:12 UTC (rev 126456)
+++ zope.sendmail/trunk/src/zope/sendmail/zcml.py	2012-05-23 13:22:33 UTC (rev 126457)
@@ -103,7 +103,7 @@
             thread.start()
 
     _context.action(
-            discriminator = ('delivery', name),
+            discriminator = ('utility', IMailDelivery, name),
             callable = createQueuedDelivery,
             args = () )