ipc+lei: switch to awaitpid

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

diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm
index 5ad214518e90b45a08b5701db51e582c3fe3980f..3e92242ec044039aac8f1b91664c85e85cdf6394 100644 (file)
--- a/lib/PublicInbox/LeiUp.pm
+++ b/lib/PublicInbox/LeiUp.pm
@@ -32,8 +32,10 @@ sub up1 ($$) {
        my $rawstr = $lss->{-cfg}->{'lei.internal.rawstr'} //
                (scalar(@$q) == 1 && substr($q->[0], -1) eq "\n");
        if ($rawstr) {
-               scalar(@$q) > 1 and
-                       die "$f: lei.q has multiple values (@$q) (out=$out)\n";
+               die <<EOM if scalar(@$q) > 1;
+$f: lei.q has multiple values (@$q) (out=$out)
+$f: while lei.internal.rawstr is set
+EOM
                $lse->query_approxidate($lse->git, $mset_opt->{qstr} = $q->[0]);
        } else {
                $mset_opt->{qstr} = $lse->query_argv_to_string($lse->git, $q);
@@ -163,9 +165,8 @@ sub _complete_up { # lei__complete hook
        map { $match_cb->($_) } PublicInbox::LeiSavedSearch::list($lei);
 }
 
-sub _wq_done_wait { # dwaitpid callback
-       my ($arg, $pid) = @_;
-       my ($wq, $lei) = @$arg;
+sub _wq_done_wait { # awaitpid cb (via awaitpid_init)
+       my ($pid, $wq, $lei) = @_;
        $lei->child_error($?, 'auth failure') if $?
 }