lei up --all: show output for warnings

[public-inbox.git] / lib / PublicInbox / LEI.pm

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index fd59235846ae889b5ffab63bb5e0da7a8816b23a..183cb545fe55276053c0d9110eef0823d1d08d11 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -203,6 +203,11 @@ our %CMD = ( # sorted in order of importance/use:
        qw(git-dir=s@ cwd! verbose|v+ color:s no-color drq:1 dequote-only:1),
        @diff_opt, @lxs_opt, @net_opt, @c_opt ],
 
+'mail-diff' => [ '--stdin|LOCATION...', 'diff the contents of emails',
+       'stdin|', # /|\z/ must be first for lone dash
+       qw(verbose|v+ color:s no-color raw-header),
+       @diff_opt, @net_opt, @c_opt ],
+
 'add-external' => [ 'LOCATION',
        'add/set priority of a publicinbox|extindex for extra matches',
        qw(boost=i mirror=s inbox-version=i epoch=s verbose|v+),
@@ -517,7 +522,7 @@ sub sigint_reap {
 sub fail ($$;$) {
        my ($self, $buf, $exit_code) = @_;
        $self->{failed}++;
-       err($self, $buf) if defined $buf;
+       warn($buf, "\n") if defined $buf;
        $self->{pkt_op_p}->pkt_do('fail_handler') if $self->{pkt_op_p};
        x_it($self, ($exit_code // 1) << 8);
        undef;
@@ -537,7 +542,7 @@ sub puts ($;@) { out(shift, map { "$_\n" } @_) }
 sub child_error { # passes non-fatal curl exit codes to user
        my ($self, $child_error, $msg) = @_; # child_error is $?
        $child_error ||= 1 << 8;
-       $self->err($msg) if $msg;
+       warn($msg, "\n") if defined $msg;
        if ($self->{pkt_op_p}) { # to top lei-daemon
                $self->{pkt_op_p}->pkt_do('child_error', $child_error);
        } elsif ($self->{sock}) { # to lei(1) client
@@ -583,8 +588,12 @@ sub _lei_atfork_child {
        eval 'no warnings; undef $PublicInbox::LeiNoteEvent::to_flush';
        undef $errors_log;
        $quit = \&CORE::exit;
-       $self->{-eml_noisy} or # only "lei import" sets this atm
-               $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
+       if (!$self->{-eml_noisy}) { # only "lei import" sets this atm
+               my $cb = $SIG{__WARN__} // \&CORE::warn;
+               $SIG{__WARN__} = sub {
+                       $cb->(@_) unless PublicInbox::Eml::warn_ignore(@_)
+               };
+       }
        $current_lei = $persist ? undef : $self; # for SIG{__WARN__}
 }