branch master updated: Improve exception handling for channel instance derivations

[Christopher Baines]

This is an automated email from the git hooks/post-receive script.

cbaines pushed a commit to branch master
in repository data-service.

The following commit(s) were added to refs/heads/master by this push:
     new 26f517d  Improve exception handling for channel instance derivations
26f517d is described below

commit 26f517d9c20d357c5df6c87690ec92c970755b9b
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sat Feb 3 11:08:04 2024 +0100

    Improve exception handling for channel instance derivations
---
 guix-data-service/jobs/load-new-guix-revision.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm 
b/guix-data-service/jobs/load-new-guix-revision.scm
index 2737636..0dc43a7 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1190,10 +1190,12 @@
                   (with-exception-handler
                       (lambda (exn)
                         (if (inferior-protocol-error? exn)
-                            (simple-format (current-error-port)
-                                           "ignoring ~A for ~A\n"
-                                           exn
-                                           system)
+                            (begin
+                              (simple-format (current-error-port)
+                                             "ignoring ~A for ~A\n"
+                                             exn
+                                             system)
+                              #f)
                             (raise-exception exn)))
                     (lambda ()
                       (with-throw-handler #t
@@ -1214,12 +1216,13 @@
     (for-each
      (match-lambda
        ((_ . manifest-and-profile)
-        (and=> (assq-ref manifest-and-profile 'manifest-entry-item)
-               (lambda (drv)
-                 (add-temp-root store drv)))
-        (and=> (assq-ref manifest-and-profile 'profile)
-               (lambda (drv)
-                 (add-temp-root store drv)))))
+        (when manifest-and-profile
+          (and=> (assq-ref manifest-and-profile 'manifest-entry-item)
+                 (lambda (drv)
+                   (add-temp-root store drv)))
+          (and=> (assq-ref manifest-and-profile 'profile)
+                 (lambda (drv)
+                   (add-temp-root store drv))))))
      result)
 
     ;; Now the roots have been added to the main store connection, close the