X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiXSearch.pm;h=2958d3f910b0986baa2bccf138ee185ae35b8c7f;hb=b63e13509ce1fb359db4096b33219bcdb978e36d;hp=2a037f2bd79b0af7b4f45051f37e90c1a282a888;hpb=ac8eed6ecb389821eaafda7c695a2b99023dde4f;p=public-inbox.git diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index 2a037f2b..2958d3f9 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -342,7 +342,7 @@ sub query_remote_mboxrd { local $SIG{TERM} = sub { exit(0) }; # for DESTROY (File::Temp, $reap) my $lei = $self->{lei}; my $opt = $lei->{opt}; - my $qstr = $lei->{mset_opt}->{qstr}; + chomp(my $qstr = $lei->{mset_opt}->{qstr}); $qstr =~ s/[ \n\t]+/ /sg; # make URLs less ugly my @qform = (x => 'm'); push(@qform, t => 1) if $opt->{threads}; @@ -409,7 +409,10 @@ sub git { $_[0]->{git} // die 'BUG: git uninitialized' } sub xsearch_done_wait { # dwaitpid callback my ($arg, $pid) = @_; my ($wq, $lei) = @$arg; - $lei->child_error($?, 'non-fatal error from '.ref($wq)) if $?; + return if !$?; + my $s = $? & 127; + return $lei->child_error($?) if $s == 13 || $s == 15; + $lei->child_error($?, 'non-fatal error from '.ref($wq)." \$?=$?"); } sub query_done { # EOF callback for main daemon