Add Debian directory
[mspang/vmailman.git] / debian / patches / 30_pipermail_threads.patch
1 Patch: 30_pipermail_threads.patch
2 Author: Tollef Fog Heen <tfheen@debian.org>
3 Pipermail non-appropriate output.  Change that.
4 Index: Mailman/Archiver/pipermail.py
5 ===================================================================
6 --- Mailman/Archiver/pipermail.py.orig  2006-08-15 15:12:18.000000000 +0800
7 +++ Mailman/Archiver/pipermail.py       2006-08-15 15:14:34.000000000 +0800
8 @@ -122,9 +122,9 @@
9          parentID = article.parentID
10          if parentID is not None and self.articleIndex.has_key(parentID):
11              parent = self.getArticle(archive, parentID)
12 -            myThreadKey = parent.threadKey + article.date + '-'
13 +            myThreadKey = parent.threadKey + article.date + '/' + article.msgid + '-'
14          else:
15 -            myThreadKey = article.date + '-'
16 +            myThreadKey = article.date + '/' + article.msgid + '-'
17          article.threadKey = myThreadKey
18          key = myThreadKey, article.msgid
19          self.setThreadKey(archive, key, article.msgid)
20 @@ -418,7 +418,7 @@
21                  else:
22                      parent = self.database.getArticle(self.archive,
23                                                      article.parentID)
24 -                    article.threadKey = parent.threadKey+article.date+'-'
25 +                    article.threadKey = parent.threadKey + article.date + '/' + article.msgid + '-'
26                  self.database.setThreadKey(self.archive,
27                      (article.threadKey, article.msgid),
28                      msgid)
29 @@ -632,9 +632,9 @@
30              article.parentID = parentID = self.get_parent_info(arch, article)
31              if parentID:
32                  parent = self.database.getArticle(arch, parentID)
33 -                article.threadKey = parent.threadKey + article.date + '-'
34 +                article.threadKey = parent.threadKey + article.date + '/' + article.msgid + '-'
35              else:
36 -                article.threadKey = article.date + '-'
37 +                article.threadKey = article.date + '/' + article.msgid + '-'
38              key = article.threadKey, article.msgid
39  
40              self.database.setThreadKey(arch, key, article.msgid)