Update of /cvsroot/mailman/mailman/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16459
Modified Files:
Tag: Release_2_1-maint
update
Log Message:
update_pending(): Tokio Kikuchi's patch #899263 for ignoring duplicate pending
ids. (With slight modification by BAW.)
Index: update
===================================================================
RCS file: /cvsroot/mailman/mailman/bin/update,v
retrieving revision 2.22.2.2
retrieving revision 2.22.2.3
diff -u -d -r2.22.2.2 -r2.22.2.3
--- update 10 Feb 2004 22:59:04 -0000 2.22.2.2
+++ update 22 Feb 2004 22:43:15 -0000 2.22.2.3
@@ -582,8 +582,10 @@
elif op == Pending.HELD_MESSAGE:
# data[0] is the hold id. There better only be one entry per id
id = data[0]
- assert not holds_by_id.has_key(id)
- holds_by_id[id] = (key, val)
+ if holds_by_id.has_key(id):
+ print _('WARNING: Ignoring duplicate pending ID: %(id)s.')
+ else:
+ holds_by_id[id] = (key, val)
# Now we have to lock every list and re-pend all the appropriate
# requests. Note that this will reset all the expiration dates, but that
# should be fine.
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
