* [PATCH 3/1] inbox: avoid trying s// on undef
2016-06-26 23:39 7% ` [PATCH 2/1] inbox: ensure we do not show leading "From " lines Eric Wong
@ 2016-06-26 23:42 4% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-06-26 23:42 UTC (permalink / raw)
To: meta
Oops, I guess I'm trigger-happy today.
Fixes: 31a6ff1221fe ("inbox: ensure we do not show leading "From " lines")
---
lib/PublicInbox/Inbox.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 87c2c9f..ada713c 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -100,7 +100,7 @@ sub msg_by_path ($$;$) {
my ($self, $path, $ref) = @_;
# TODO: allow other refs:
my $str = git($self)->cat_file('HEAD:'.$path, $ref);
- $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
+ $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
$str;
}
^ permalink raw reply related [relevance 4%]
* [PATCH 2/1] inbox: ensure we do not show leading "From " lines
@ 2016-06-26 23:39 7% ` Eric Wong
2016-06-26 23:42 4% ` [PATCH 3/1] inbox: avoid trying s// on undef Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-06-26 23:39 UTC (permalink / raw)
To: meta
Some messages will be misimported due to an old bug,
clean them up and ensure we do not propagate the mistake.
Followup-to: a0c07cba0e5d ("mda: drop leading "From " lines again")
---
lib/PublicInbox/Inbox.pm | 4 +++-
lib/PublicInbox/SearchIdx.pm | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 34191fc..87c2c9f 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -99,7 +99,9 @@ sub nntp_usable {
sub msg_by_path ($$;$) {
my ($self, $path, $ref) = @_;
# TODO: allow other refs:
- git($self)->cat_file('HEAD:'.$path, $ref);
+ my $str = git($self)->cat_file('HEAD:'.$path, $ref);
+ $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
+ $str;
}
sub msg_by_mid ($$;$) {
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 58eccc1..c2bf9a2 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -311,6 +311,8 @@ sub do_cat_mail {
my ($git, $blob, $sizeref) = @_;
my $mime = eval {
my $str = $git->cat_file($blob, $sizeref);
+ # fixup bugs from import:
+ $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
Email::MIME->new($str);
};
$@ ? undef : $mime;
--
EW
^ permalink raw reply related [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-06-26 23:31 [PATCH] mda: drop leading "From " lines again Eric Wong
2016-06-26 23:39 7% ` [PATCH 2/1] inbox: ensure we do not show leading "From " lines Eric Wong
2016-06-26 23:42 4% ` [PATCH 3/1] inbox: avoid trying s// on undef Eric Wong
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).