From 215a67238a9d9d032dfdaf9b2c2a9780f9985926 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Thu, 1 Feb 2024 10:47:54 +0100
Subject: Ignore inferior-protocol-error when computing channel instances

Since this seems to happen for i586-gnu for core-updates currently and I can't
seem to reproduce the issue locally or work out what's wrong.
---
 guix-data-service/jobs/load-new-guix-revision.scm | 32 +++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'guix-data-service')

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index d943c9f..7fc57f7 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1184,18 +1184,28 @@
              (with-resource-from-pool inferior-and-store-pool res
                (match res
                  ((inferior . inferior-store)
-                  (with-throw-handler #t
+                  (with-exception-handler
+                      (lambda (exn)
+                        (if (inferior-protocol-error? exn)
+                            (simple-format (current-error-port)
+                                           "ignoring ~A for ~A\n"
+                                           exn
+                                           system)
+                            (raise-exception exn)))
                     (lambda ()
-                      (cons system
-                            (inferior-eval-with-store/non-blocking
-                             inferior
-                             inferior-store
-                             (inferior-code channel-instance system))))
-                    (lambda _
-                      (simple-format
-                       (current-error-port)
-                       "failed to compute channel instance derivation for ~A\n"
-                       system)))))))
+                      (with-throw-handler #t
+                        (lambda ()
+                          (cons system
+                                (inferior-eval-with-store/non-blocking
+                                 inferior
+                                 inferior-store
+                                 (inferior-code channel-instance system))))
+                        (lambda _
+                          (simple-format
+                           (current-error-port)
+                           "failed to compute channel instance derivation for ~A\n"
+                           system))))
+                    #:unwind? #t)))))
            systems)))
 
     (for-each
-- 
cgit v1.2.3