aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix-data-service/jobs/load-new-guix-revision.scm23
1 files 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