[Pkg-mailman-hackers] Pkg-mailman commit - rev 632 - in trunk/debian: . patches

[Thijs Kinkhorst]

Author: thijs
Date: 2009-09-25 10:38:26 +0000 (Fri, 25 Sep 2009)
New Revision: 632

Modified:
   trunk/debian/changelog
   trunk/debian/patches/30_pipermail_threads.patch
Log:
* Update 30_pipermail_threads patch to use sequence ID instead of
  message ID, avoids thread breakage in archives. Thanks
  Mark Sapiro.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-09-25 10:31:18 UTC (rev 631)
+++ trunk/debian/changelog	2009-09-25 10:38:26 UTC (rev 632)
@@ -4,8 +4,11 @@
     permissions are already set correctly in the deb. Thanks Paul
     Slootman (closes: #544046).
   * Add Slovak debconf translation, thanks Ivan Masár (closes: #531576).
+  * Update 30_pipermail_threads patch to use sequence ID instead of
+    message ID, avoids thread breakage in archives. Thanks
+    Mark Sapiro.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Fri, 25 Sep 2009 12:30:10 +0200
+ -- Thijs Kinkhorst <thijs at debian.org>  Fri, 25 Sep 2009 12:36:37 +0200
 
 mailman (1:2.1.12-2) unstable; urgency=low
 

Modified: trunk/debian/patches/30_pipermail_threads.patch
===================================================================
--- trunk/debian/patches/30_pipermail_threads.patch	2009-09-25 10:31:18 UTC (rev 631)
+++ trunk/debian/patches/30_pipermail_threads.patch	2009-09-25 10:38:26 UTC (rev 632)
@@ -1,40 +1,48 @@
+
 Patch: 30_pipermail_threads.patch
-Author: Tollef Fog Heen <tfheen at debian.org>
-Pipermail non-appropriate output, change that (Closes: #167758)
-Index: mailman-2.1.12/Mailman/Archiver/pipermail.py
+Author: Tollef Fog Heen <tfheen at debian.org> and Mark Sapiro <mark at msapiro.net>
+Pipermail non-appropriate output.  Change that.
+Will be integrated into next upstream release:
+http://lists.alioth.debian.org/pipermail/pkg-mailman-hackers/2009-July/002754.html
+Index: Mailman/Archiver/pipermail.py
 ===================================================================
---- mailman-2.1.12.orig/Mailman/Archiver/pipermail.py	2009-03-02 20:41:53.000000000 +0100
-+++ mailman-2.1.12/Mailman/Archiver/pipermail.py	2009-03-02 20:50:05.000000000 +0100
-@@ -122,9 +122,9 @@
+--- Mailman/Archiver/pipermail.py.orig	2006-08-15 15:12:18.000000000 +0800
++++ Mailman/Archiver/pipermail.py	2006-08-15 15:14:34.000000000 +0800
+@@ -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 + '/' + article.msgid + '-'
++            myThreadKey = (parent.threadKey + article.date + '.'
++                           + str(article.sequence) + '-')
          else:
 -            myThreadKey = article.date + '-'
-+            myThreadKey = article.date + '/' + article.msgid + '-'
++            myThreadKey = article.date + '.' + str(article.sequence) + '-'
          article.threadKey = myThreadKey
          key = myThreadKey, article.msgid
          self.setThreadKey(archive, key, article.msgid)
-@@ -418,7 +418,7 @@
+@@ -418,7 +418,8 @@
                  else:
                      parent = self.database.getArticle(self.archive,
                                                      article.parentID)
 -                    article.threadKey = parent.threadKey+article.date+'-'
-+                    article.threadKey = parent.threadKey + article.date + '/' + article.msgid + '-'
++                    article.threadKey = (parent.threadKey + article.date + '.'
++                                         + str(article.sequence) + '-')
                  self.database.setThreadKey(self.archive,
                      (article.threadKey, article.msgid),
                      msgid)
-@@ -632,9 +632,9 @@
+@@ -632,9 +632,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 + '/' + article.msgid + '-'
++                article.threadKey = (parent.threadKey + article.date + '.'
++                                     + str(article.sequence) + '-')
              else:
 -                article.threadKey = article.date + '-'
-+                article.threadKey = article.date + '/' + article.msgid + '-'
++                article.threadKey = (article.date + '.'
++                                     + str(article.sequence) + '-')
              key = article.threadKey, article.msgid
  
              self.database.setThreadKey(arch, key, article.msgid)
+