diff options
| -rw-r--r-- | lib/PublicInbox/Qspawn.pm | 6 | ||||
| -rw-r--r-- | lib/PublicInbox/SolverGit.pm | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index 1a2b70e7..65bb178a 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -56,9 +56,7 @@ sub _do_spawn { ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $cmd_env, \%opts); - # drop any IO handles opt was holding open via $opt->{hold} - # No need to hold onto the descriptor once the child process has it. - $self->{args} = $cmd; # keep this around for logging + $self->{args} = $opts{quiet} ? undef : $cmd; if (defined $self->{pid}) { $limiter->{running}++; @@ -108,7 +106,7 @@ sub waitpid_err ($$) { if ($err) { $self->{err} = $err; - if ($env && !$env->{'qspawn.quiet'}) { + if ($env && $self->{args}) { log_err($env, join(' ', @{$self->{args}}) . ": $err"); } } diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index c9812b32..a78360fd 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -499,7 +499,7 @@ sub do_git_apply ($) { } while (@$patches && $len < $ARG_SIZE_MAX && !oids_same_ish($patches->[0]->{oid_b}, $prv_oid_b)); - my $opt = { 2 => 1, -C => $dn }; + my $opt = { 2 => 1, -C => $dn, quiet => 1 }; my $qsp = PublicInbox::Qspawn->new(\@cmd, $self->{git_env}, $opt); $self->{-cur_di} = $di; $self->{-qsp} = $qsp; |