user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/2] lei rediff: quiet warnings from Import and Eml
Date: Mon, 27 Sep 2021 04:59:30 +0000	[thread overview]
Message-ID: <20210927045931.18609-2-e@80x24.org> (raw)
In-Reply-To: <20210927045931.18609-1-e@80x24.org>

lei rediff is expected to see partial patch fragments and such,
so silence warnings when something isn't exactly a valid email
message.
---
 lib/PublicInbox/LeiRediff.pm | 11 +++++++++--
 t/solver_git.t               |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/LeiRediff.pm b/lib/PublicInbox/LeiRediff.pm
index ea9b2a643f9a..f6960560f1a2 100644
--- a/lib/PublicInbox/LeiRediff.pm
+++ b/lib/PublicInbox/LeiRediff.pm
@@ -193,8 +193,15 @@ sub extract_oids { # Eml each_part callback
 
 sub input_eml_cb { # callback for all emails
 	my ($self, $eml) = @_;
-	$self->{tmp_sto}->add_eml($eml);
-	$self->{tmp_sto}->done;
+	{
+		local $SIG{__WARN__} = sub {
+			return if "@_" =~ /^no email in From: .*? or Sender:/;
+			return if PublicInbox::Eml::warn_ignore(@_);
+			warn @_;
+		};
+		$self->{tmp_sto}->add_eml($eml);
+		$self->{tmp_sto}->done;
+	}
 	$eml->each_part(\&extract_oids, $self, 1);
 }
 
diff --git a/t/solver_git.t b/t/solver_git.t
index d5f4c4a02758..3c0b7f6524c6 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -93,6 +93,7 @@ index 15ac20eb..771486c4
 EOM
 	like($lei_out, qr/\Q$exp\E/,
 		'preserve mode, regen header + context from -U0 patch');
+	is($lei_err, '', 'no warnings from bare patch');
 	my $e = { GIT_DIR => "$ENV{HOME}/.local/share/lei/store/ALL.git" };
 	my @x = xqx([qw(git cat-file --batch-all-objects --batch-check)], $e);
 	is_deeply(\@x, [], 'no objects stored') or diag explain(\@x);

  reply	other threads:[~2021-09-27  4:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-27  4:59 [PATCH 0/2] lei rediff: --drq and --dequote-only Eric Wong
2021-09-27  4:59 ` Eric Wong [this message]
2021-09-27  4:59 ` [PATCH 2/2] lei rediff: add " 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=20210927045931.18609-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    --subject='Re: [PATCH 1/2] lei rediff: quiet warnings from Import and Eml' \
    /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

Code repositories for project(s) associated with this 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).