← Back to branch summary

~ubuntu-branches/ubuntu/quantal/mailman/quantal

« back to all changes in this revision

Viewing changes to debian/patches/00_stolen_from_HEAD.patch

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst
  • Date: 2008-08-11 16:06:19 UTC
  • mfrom: (1.1.4 upstream) (2.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20080811160619-ymr837d03w2qvnh9
Tags: 1:2.1.11-3
http://bugs.debian.org/494110
http://bugs.debian.org/492297
* Updated Catalan debconf translation, thanks David Planella Molas
  (Closes: #494110).
* Added patch 68_update_catalan to update Catalan program translation,
  thanks Jordi Mallach (Closes: #492297).
* Add a README.source file referring to quilt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/00_stolen_from_HEAD.patch
1
1
Patch: 00_stolen_from_HEAD.patch
2
2
Author: Tollef Fog Heen <tfheen@debian.org>
3
3
Handle empty queue files.
4
 
Index: Mailman/Handlers/Scrubber.py
 
4
Index: mailman-2.1.10/Mailman/Handlers/Scrubber.py
5
5
===================================================================
6
 
--- Mailman/Handlers/Scrubber.py.orig   2006-08-15 15:12:19.000000000 +0800
7
 
+++ Mailman/Handlers/Scrubber.py        2006-08-15 15:14:15.000000000 +0800
8
 
@@ -370,6 +370,8 @@
9
 
                     t = u.encode('ascii', 'replace')
 
6
--- mailman-2.1.10.orig/Mailman/Handlers/Scrubber.py    2008-04-21 20:28:22.000000000 +0200
 
7
+++ mailman-2.1.10/Mailman/Handlers/Scrubber.py 2008-06-15 18:49:38.000000000 +0200
 
8
@@ -385,6 +385,8 @@
 
9
                     t = unicode(t, 'ascii', 'replace')
10
10
                 try:
11
11
                     # Should use HTML-Escape, or try generalizing to UTF-8
12
12
+                    if len(charset) == 0:
13
13
+                        charset = 'us-ascii'
14
14
                     t = t.encode(charset, 'replace')
15
 
                 except (UnicodeError, LookupError, ValueError):
16
 
                     t = t.encode(lcset, 'replace')
 
15
                 except (UnicodeError, LookupError, ValueError,
 
16
                         AssertionError):