[Pkg-mailman-hackers] Pkg-mailman commit - rev 107 - in branches/pkg-split/core/debian: . patches

[Bernd S. Brentrup]

Author: bsb
Date: 2004-05-03 06:12:23 -0600 (Mon, 03 May 2004)
New Revision: 107

Modified:
   branches/pkg-split/core/debian/changelog
   branches/pkg-split/core/debian/patches/00list
   branches/pkg-split/core/debian/patches/60_type_error_temp_fix.dpatch
Log:
Patch for Bug#246681.

Modified: branches/pkg-split/core/debian/changelog
===================================================================
--- branches/pkg-split/core/debian/changelog	2004-05-03 08:07:20 UTC (rev 106)
+++ branches/pkg-split/core/debian/changelog	2004-05-03 12:12:23 UTC (rev 107)
@@ -5,12 +5,15 @@
     mailman-i18n, mailman-en (bsb,
     closes: #176439, #238377, #233410, #237772).
   * Outlining glue packages mailman-spamassassin, mailman-spamprobe,
-    mailman-savannah and mailman-clamav (bsb, cf debian/TODO).
+    mailman-savannah and mailman-clamav (bsb, cf debian/TODO). Tollef
+    says splitting off single file packages is silly.
   * preinst: Add code making sure /var/lib/mailman/pythonlib doesn't
     contain cruft from ancient installations (bsb, closes: #242740).
- 
- -- Siggy Brentrup <bsb@debian.org>  Sat, 24 Apr 2004 19:59:45 +0200
+  * 60_type_error_temp_fix.dpatch: curing symptom where new_member_options
+    is a list instead of an integer (closes: #246681).
 
+ -- Siggy Brentrup <bsb@debian.org>  Mon,  3 May 2004 14:05:43 +0200
+
 mailman (2.1.4-4) unstable; urgency=medium
 
   * Urgency medium because RC bugs are fixed.

Modified: branches/pkg-split/core/debian/patches/00list
===================================================================
--- branches/pkg-split/core/debian/patches/00list	2004-05-03 08:07:20 UTC (rev 106)
+++ branches/pkg-split/core/debian/patches/00list	2004-05-03 12:12:23 UTC (rev 107)
@@ -21,4 +21,5 @@
 55_options_traceback
 56_fix_de_broken_links
 57_fix_missing_da_template
+60_type_error_temp_fix
 99_js_templates

Modified: branches/pkg-split/core/debian/patches/60_type_error_temp_fix.dpatch
===================================================================
--- branches/pkg-split/core/debian/patches/60_type_error_temp_fix.dpatch	2004-05-03 08:07:20 UTC (rev 106)
+++ branches/pkg-split/core/debian/patches/60_type_error_temp_fix.dpatch	2004-05-03 12:12:23 UTC (rev 107)
@@ -27,7 +27,7 @@
 diff -urNad /debuild/mine/mailman/build-area/mailman-2.1.4/Mailman/Gui/General.py mailman-2.1.4/Mailman/Gui/General.py
 --- /debuild/mine/mailman/build-area/mailman-2.1.4/Mailman/Gui/General.py	2002-12-11 13:41:56.000000000 +0100
 +++ mailman-2.1.4/Mailman/Gui/General.py	2004-04-30 19:29:10.000000000 +0200
-@@ -50,7 +50,10 @@
+@@ -50,7 +50,11 @@
              _('Filter out duplicate messages to list members (if possible)'),
              }
  
@@ -35,7 +35,8 @@
 +        try:
 +            optvals = [mlist.new_member_options & bitfields[o] for o in OPTIONS]
 +        except TypeError:
-+            optvals = [ 0, 0, 0, bitfields['nodupes'] ]
++            optvals = [ bitfields[o] for o in OPTIONS
++                        if bitfields[o] in mlist.new_member_options ]
          opttext = [bitdescrs[o] for o in OPTIONS]
  
          rtn = [