From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 53A001FB07 for ; Mon, 13 Sep 2021 20:53:56 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 6/6] lei up: fix --mua with single output Date: Mon, 13 Sep 2021 20:53:55 +0000 Message-Id: <20210913205355.13002-7-e@80x24.org> In-Reply-To: <20210913205355.13002-1-e@80x24.org> References: <20210913205355.13002-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Oops :x Fixes: b584a53f053a7629 ("lei up: support --all for IMAP folders") --- lib/PublicInbox/LeiUp.pm | 25 +++++++++++++++---------- t/lei-up.t | 4 ++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm index a16117c9..53f06dbc 100644 --- a/lib/PublicInbox/LeiUp.pm +++ b/lib/PublicInbox/LeiUp.pm @@ -54,16 +54,21 @@ sub up1 ($$) { 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 @@ sub lei_up { $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 @@ sub lei_up { $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 6b34774d..8937cfb1 100644 --- a/t/lei-up.t +++ b/t/lei-up.t @@ -34,6 +34,10 @@ test_lei(sub { 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;