[Pkg-mailman-hackers] Pkg-mailman commit - rev 751 - in branches/experimental/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2013-12-29 02:09:18 +0000 (Sun, 29 Dec 2013)
New Revision: 751

Added:
   branches/experimental/debian/patches/80_sync_members_unicode.patch
Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/series
Log:
apply upstream bugfixe?\204?\178s?\204?\178 for sync_members

Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2013-12-29 01:59:59 UTC (rev 750)
+++ branches/experimental/debian/changelog	2013-12-29 02:09:18 UTC (rev 751)
@@ -1,8 +1,9 @@
 mailman (1:2.1.16-1exp1) experimental; urgency=low
 
   * Convert to UTF-8. (Closes: #398777, #535296, #732929)
+  * Apply upstream bugfix for sync_members. (Closes: #732741)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Sun, 29 Dec 2013 01:43:26 +0000
+ -- Thorsten Glaser <tg at mirbsd.de>  Sun, 29 Dec 2013 02:08:38 +0000
 
 mailman (1:2.1.16-1) unstable; urgency=low
 

Added: branches/experimental/debian/patches/80_sync_members_unicode.patch
===================================================================
--- branches/experimental/debian/patches/80_sync_members_unicode.patch	                        (rev 0)
+++ branches/experimental/debian/patches/80_sync_members_unicode.patch	2013-12-29 02:09:18 UTC (rev 751)
@@ -0,0 +1,39 @@
+Description: Fix UnicodeError in sync_members
+Origin: https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/revision/1429
+ and https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/revision/1437
+Bug-Debian: #732741
+Forwarded: not-needed
+Applied-Upstream: in 2.1.18 (2.1.17 contains the bug!)
+
+--- a/bin/sync_members
++++ b/bin/sync_members
+@@ -1,6 +1,6 @@
+ #! @PYTHON@
+ #
+-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
++# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+@@ -256,6 +256,10 @@ def main():
+             try:
+                 if not dryrun:
+                     mlist.ApprovedAddMember(userdesc, welcome, notifyadmin)
++                # Avoid UnicodeError if name can't be decoded
++                if isinstance(name, str):
++                    name = unicode(name, errors='replace')
++                name = name.encode(enc, 'replace')
+                 s = email.Utils.formataddr((name, addr)).encode(enc, 'replace')
+                 print _('Added  : %(s)s')
+             except Errors.MMAlreadyAMember:
+@@ -276,6 +280,10 @@ def main():
+                     # reasons is in the database.  Use a lower level remove to
+                     # get rid of this member's entry
+                     mlist.removeMember(addr)
++            # Avoid UnicodeError if name can't be decoded
++            if isinstance(name, str):
++                name = unicode(name, errors='replace')
++            name = name.encode(enc, 'replace')
+             s = email.Utils.formataddr((name, addr)).encode(enc, 'replace')
+             print _('Removed: %(s)s')
+ 

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2013-12-29 01:59:59 UTC (rev 750)
+++ branches/experimental/debian/patches/series	2013-12-29 02:09:18 UTC (rev 751)
@@ -9,5 +9,6 @@
 63_update_default_server_language.patch
 66_donot_let_cache_html_pages.patch
 79_archiver_slash.patch
+80_sync_members_unicode.patch
 90_gettext_errors.patch
 91_utf8.patch