about summary refs log tree commit homepage
path: root/lib/PublicInbox/SolverGit.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2023-04-29 20:02:14 +0000
committerEric Wong <e@80x24.org>2023-05-01 02:50:28 +0000
commit0de8537965927d200a36363d8f776e4ca5036ed8 (patch)
tree9d9cf0d6b2325b07b969c40c9eb33a080a75cd49 /lib/PublicInbox/SolverGit.pm
parentf9d5f602ff71571bd7770fba98f66b32c621d9ba (diff)
downloadpublic-inbox-0de8537965927d200a36363d8f776e4ca5036ed8.tar.gz
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.
Diffstat (limited to 'lib/PublicInbox/SolverGit.pm')
-rw-r--r--lib/PublicInbox/SolverGit.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 38fba0ca..ebb5cdff 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});