From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] import: normalize body by stripping trailing newlines
Date: Thu, 12 May 2016 09:52:03 +0000 [thread overview]
Message-ID: <20160512095205.6139-1-e@80x24.org> (raw)
Mbox formatters may add extra newlines at the end of the
message, and that's not relevant for comparing messages
for deletion.
---
lib/PublicInbox/Import.pm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 5a3c585..1f52a0c 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -65,6 +65,13 @@ sub now2822 () {
$day, $t[3], $mon, $t[5] + 1900, $t[2], $t[1], $t[0]);
}
+sub norm_body ($) {
+ my ($mime) = @_;
+ my $b = $mime->body_raw;
+ $b =~ s/(\r?\n)+\z//s;
+ $b
+}
+
# returns undef on non-existent
# ('MISMATCH', msg) on mismatch
# (:MARK, msg) on success
@@ -106,7 +113,7 @@ sub remove {
die "bad read on final byte: <$lf>" if $lf ne "\n";
my $cur = Email::MIME->new($buf);
if ($cur->header('Subject') ne $mime->header('Subject') ||
- $cur->body ne $mime->body) {
+ norm_body($cur) ne norm_body($mime)) {
return ('MISMATCH', $cur);
}
next reply other threads:[~2016-05-12 9:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 9:52 Eric Wong [this message]
2016-05-12 9:52 ` [PATCH] import: fallback to email if '<>' exists in author name Eric Wong
2016-05-12 9:52 ` [PATCH] git-http-backend: do not drop connection on successful finish Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160512095205.6139-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).