lib/PublicInbox/LeiUp.pm | 25 +++++++++++++++---------- t/lei-up.t | 4 ++++ diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm index a16117c9b604ea5b304d3cb5217b15cfd263cc8f..53f06dbc05a15e3816b918b4824d8c6693ccac43 100644 --- a/lib/PublicInbox/LeiUp.pm +++ b/lib/PublicInbox/LeiUp.pm @@ -54,16 +54,21 @@ } sub up1_redispatch { my ($lei, $out, $op_p) = @_; - my $l = bless { %$lei }, ref($lei); - $l->{opt} = { %{$l->{opt}} }; # deep copy - delete $l->{sock}; # do not close - $l->{''} = $op_p; # daemon only ($l => $lei => script/lei) - - # make close($l->{1}) happy in lei->dclose - open my $fh, '>&', $l->{1} or return $l->child_error(0, "dup: $!"); + my $l; + if (defined($lei->{opt}->{mua})) { # single output + $l = $lei; + } else { # multiple outputs + $l = bless { %$lei }, ref($lei); + $l->{opt} = { %{$l->{opt}} }; # deep copy + delete $l->{sock}; # do not close + # make close($l->{1}) happy in lei->dclose + open my $fh, '>&', $l->{1} or + return $l->child_error(0, "dup: $!"); + $l->{1} = $fh; + } local $PublicInbox::LEI::current_lei = $l; local %ENV = %{$l->{env}}; - $l->{1} = $fh; + $l->{''} = $op_p; # daemon only ($l => $lei => script/lei) eval { $l->qerr("# updating $out"); up1($l, $out); @@ -92,7 +97,7 @@ my $self = bless { -mail_sync => 1 }, __PACKAGE__; $lei->{lse} = $lei->_lei_store(1)->write_prepare($lei)->search; if (defined(my $all = $opt->{all})) { return $lei->fail("--all and @outs incompatible") if @outs; - length($opt->{mua}//'') and return + defined($opt->{mua}) and return $lei->fail('--all and --mua= are incompatible'); @outs = PublicInbox::LeiSavedSearch::list($lei); if ($all eq 'local') { @@ -110,7 +115,7 @@ $self->{remote} = [ grep(/$REMOTE_RE/, @outs) ]; $self->{local} = [ grep(!/$REMOTE_RE/, @outs) ]; } ((@{$self->{local} // []} + @{$self->{remote} // []}) > 1 && - length($opt->{mua} // '')) and return $lei->fail(<{mua})) and return $lei->fail(<{remote}) { # setup lei->{auth} diff --git a/t/lei-up.t b/t/lei-up.t index 6b34774d79da7f6158ff177308ed26078ee1d86c..8937cfb18e7d03dc71c693bbc4971d08d55a2c98 100644 --- a/t/lei-up.t +++ b/t/lei-up.t @@ -34,6 +34,10 @@ open $fh, "$ENV{HOME}/b" or xbail "open: $!"; $uc = do { local $/; <$fh> }; is($uc, $exp, 'uncompressed both match'); + + lei_ok [ 'up', "$ENV{HOME}/b", "--mua=touch $ENV{HOME}/c" ], + undef, { run_mode => 0 }; + ok(-f "$ENV{HOME}/c", '--mua works with single output'); }); done_testing;