lei_to_mail: don't close STDOUT unless it is a mbox* output

We only care about error checking when stdout is an mbox output
pointed to a pathname.  This is noticeable with `lei up' with
multiple non-mbox* destinations.  We'll also ensure throwing
exceptions to trigger lei->x_it from lei->do_env results in the
epoll/kqueue watch being discarded, otherwise commands may never
terminate (leading to stuck tests)

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 8d235b37..86b71fcd 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -493,6 +493,7 @@ sub x_it ($$) {
         } elsif ($quit == \&CORE::exit) { # an admin (one-shot) command
                 exit($code >> 8);
         } # else ignore if client disconnected
+        $self->dclose if $$ == $daemon_pid;
 }
 
 sub err ($;@) {
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 007191bb..a930fc30 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -612,8 +612,8 @@ sub _pre_augment_mbox {
 sub finish_output {
         my ($self, $lei) = @_;
         my $out = delete $lei->{1} // die 'BUG: no lei->{1}';
-        my $old = delete $lei->{old_1};
-        $lei->{1} = $old if $old;
+        my $old = delete $lei->{old_1} or return; # path only
+        $lei->{1} = $old;
         return if $out->close; # reaps gzip|pigz|xz|bzip2
         my $msg = "E: Error closing $lei->{ovv}->{dst}";
         $? ? $lei->child_error($?) : ($msg .= " ($!)");