[Pkg-mailman-hackers] Pkg-mailman commit - rev 800 - in trunk/debian: . contrib

[Thijs Kinkhorst]

Author: thijs
Date: 2017-09-05 14:35:22 +0000 (Tue, 05 Sep 2017)
New Revision: 800

Modified:
   trunk/debian/changelog
   trunk/debian/contrib/SpamAssassin.py
Log:
* Fixed broken dependencies in SpamAssassin.py (Closes: #838288).
  Thanks Stephen Rothwell for the patch.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2017-09-05 14:31:05 UTC (rev 799)
+++ trunk/debian/changelog	2017-09-05 14:35:22 UTC (rev 800)
@@ -1,3 +1,11 @@
+mailman (1:2.1.24-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Fixed broken dependencies in SpamAssassin.py (Closes: #838288).
+    Thanks Stephen Rothwell for the patch.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Tue, 05 Sep 2017 14:31:54 +0000
+
 mailman (1:2.1.23-1) unstable; urgency=medium
 
   * New upstream release.

Modified: trunk/debian/contrib/SpamAssassin.py
===================================================================
--- trunk/debian/contrib/SpamAssassin.py	2017-09-05 14:31:05 UTC (rev 799)
+++ trunk/debian/contrib/SpamAssassin.py	2017-09-05 14:35:22 UTC (rev 800)
@@ -28,7 +28,6 @@
 from Mailman import Errors
 from Mailman.Logging.Syslog import syslog
 from Mailman.Handlers import Hold
-from Mailman.Handlers.Moderate import matches_p
 
 SPAMD_HOST    = getattr(mm_cfg, 'SPAMASSASSIN_HOST', '')
 DISCARD_SCORE = getattr(mm_cfg, 'SPAMASSASSIN_DISCARD_SCORE', 10)
@@ -78,7 +77,7 @@
     if MEMBER_BONUS != 0:
         for sender in msg.get_senders():
             if mlist.isMember(sender) or \
-                   matches_p(sender, mlist.accept_these_nonmembers, mlist.internal_name()):
+                   mlist.GetPattern(sender, mlist.accept_these_nonmembers, at_list='accept_these_nonmembers'):
                 score -= MEMBER_BONUS
                 break