------------------------------------------------------------
revno: 1186
committer: Mark Sapiro <[email protected]>
branch nick: 2.1
timestamp: Sat 2009-08-01 12:01:28 -0700
message:
Fixed a bug that could cause incorrect threading of replies to archived
messages that arrive with timestamps in the same second.
modified:
Mailman/Archiver/pipermail.py
NEWS
--
lp:mailman/2.1
https://code.launchpad.net/~mailman-coders/mailman/2.1
Your team Mailman Checkins is subscribed to branch lp:mailman/2.1.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+edit-subscription.
=== modified file 'Mailman/Archiver/pipermail.py'
--- Mailman/Archiver/pipermail.py 2006-01-29 05:12:26 +0000
+++ Mailman/Archiver/pipermail.py 2009-08-01 19:01:28 +0000
@@ -122,9 +122,10 @@
parentID = article.parentID
if parentID is not None and self.articleIndex.has_key(parentID):
parent = self.getArticle(archive, parentID)
- myThreadKey = parent.threadKey + article.date + '-'
+ myThreadKey = (parent.threadKey + article.date + '.'
+ + str(article.sequence) + '-')
else:
- myThreadKey = article.date + '-'
+ myThreadKey = article.date + '.' + str(article.sequence) + '-'
article.threadKey = myThreadKey
key = myThreadKey, article.msgid
self.setThreadKey(archive, key, article.msgid)
@@ -418,7 +419,8 @@
else:
parent = self.database.getArticle(self.archive,
article.parentID)
- article.threadKey = parent.threadKey+article.date+'-'
+ article.threadKey = (parent.threadKey + article.date + '.'
+ + str(article.sequence) + '-')
self.database.setThreadKey(self.archive,
(article.threadKey, article.msgid),
msgid)
@@ -632,9 +634,11 @@
article.parentID = parentID = self.get_parent_info(arch, article)
if parentID:
parent = self.database.getArticle(arch, parentID)
- article.threadKey = parent.threadKey + article.date + '-'
+ article.threadKey = (parent.threadKey + article.date + '.'
+ + str(article.sequence) + '-')
else:
- article.threadKey = article.date + '-'
+ article.threadKey = (article.date + '.'
+ + str(article.sequence) + '-')
key = article.threadKey, article.msgid
self.database.setThreadKey(arch, key, article.msgid)
=== modified file 'NEWS'
--- NEWS 2009-07-31 22:37:29 +0000
+++ NEWS 2009-08-01 19:01:28 +0000
@@ -8,6 +8,9 @@
Bug Fixes and other patches
+ - Fixed a bug that could cause incorrect threading of replies to archived
+ messages that arrive with timestamps in the same second.
+
- Scrubbed HTML attachments containing tab characters would get the tabs
replaced by a string of ' ' without a semicolon. Fixed.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
