# needed to make scrubber.patch apply for Debian's mailman-2.1.5-10. --- mailman-2.1.5/debian/patches/70_invalid_utf8_dos.dpatch.org 2005-12-12 19:16:59.967724638 +0100 +++ mailman-2.1.5/debian/patches/70_invalid_utf8_dos.dpatch 2005-12-12 19:19:19.705482426 +0100 @@ -17,9 +17,9 @@ + filename = part.get_filename(_('not available')) + except UnicodeDecodeError: + filename = _('not available') + filename = Utils.oneline(filename, lcset) del part['content-type'] del part['content-transfer-encoding'] - part.set_payload(_("""\ @@ -356,7 +359,10 @@ # e.g. image/jpg (should be image/jpeg). For now we just store such # things as application/octet-streams since that seems the safest. @@ -41,6 +41,6 @@ + filename = msg.get_filename() + except UnicodeDecodeError: + filename = None - if not filename: + if not filename or mm_cfg.SCRUBBER_DONT_USE_ATTACHMENT_FILENAME: filebase = 'attachment' else: