From 0de8537965927d200a36363d8f776e4ca5036ed8 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 29 Apr 2023 20:02:14 +0000 Subject: [PATCH] solver_git: don't spew to daemon err on git apply failure Too many patches don't apply (due to coderepos being a PITA to associate) and interested admins can check for 404s to diagnose them, anyways. This reduces the noise in syslog/stderr for public-facing daemons. --- lib/PublicInbox/SolverGit.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index 38fba0ca7..ebb5cdff7 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -452,7 +452,7 @@ sub skip_identical ($$$) { } } -sub apply_result ($$) { +sub apply_result ($$) { # qx_cb my ($bref, $self) = @_; my ($qsp_err, $di) = delete @$self{qw(-qsp_err -cur_di)}; dbg($self, $$bref); @@ -466,7 +466,8 @@ sub apply_result ($$) { return do_git_apply($self); } else { $msg .= " (no patches left to try for $di->{oid_b})\n"; - ERR($self, $msg); + dbg($self, $msg); + return done($self, undef); } } else { skip_identical($self, $patches, $di->{oid_b}); -- 2.47.2