]> git.ipfire.org Git - thirdparty/public-inbox.git/commitdiff
solver_git: don't spew to daemon err on git apply failure
authorEric Wong <e@80x24.org>
Sat, 29 Apr 2023 20:02:14 +0000 (20:02 +0000)
committerEric Wong <e@80x24.org>
Mon, 1 May 2023 02:50:28 +0000 (02:50 +0000)
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

index 38fba0ca79340eb655c12a319ab28d54621644fa..ebb5cdff7dd11ac09247a2a91b1774a9e61b6446 100644 (file)
@@ -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});