Update of /cvsroot/mailman/mailman/Mailman/Queue
In directory sc8-pr-cvs1:/tmp/cvs-serv7062

Modified Files:
        BounceRunner.py 
Log Message:
_dispose(): Use mlist.internal_name().

_register_bounces(): Return empty list as default for sitebounces so
we can concatenate lists easier later.

_cleanup(): Only call _register_bounces() if there are bounces to
register.


Index: BounceRunner.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Queue/BounceRunner.py,v
retrieving revision 2.28
retrieving revision 2.29
diff -u -d -r2.28 -r2.29
--- BounceRunner.py     17 Aug 2003 17:48:41 -0000      2.28
+++ BounceRunner.py     18 Aug 2003 03:14:45 -0000      2.29
@@ -99,7 +99,7 @@
         # Store the bounce score events so we can register them periodically
         today = time.localtime()[:3]
         events = [(addr, today, msg) for addr in addrs]
-        self._bounces.setdefault(listname, []).extend(events)
+        self._bounces.setdefault(mlist.internal_name(), []).extend(events)
         self._bouncecnt += len(addrs)
 
     def _doperiodic(self):
@@ -115,7 +115,7 @@
         # First, get the list of bounces register against the site list.  For
         # these addresses, we want to register a bounce on every list the
         # address is a member of -- which we don't know yet.
-        sitebounces = self._bounces.get(mm_cfg.MAILMAN_SITE_LIST)
+        sitebounces = self._bounces.get(mm_cfg.MAILMAN_SITE_LIST, [])
         if sitebounces:
             listnames = Utils.list_names()
         else:
@@ -135,7 +135,8 @@
         self._bouncecnt = 0
 
     def _cleanup(self):
-        self._register_bounces()
+        if self._bounces:
+            self._register_bounces()
         Runner._cleanup(self)
 
 



_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins

Reply via email to