02/02: Fix load revision jobs not failing if the extraction of data fails

[Christopher Baines]

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

commit 410f58cb43f083623885a430700c6818a187cadc
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu Mar 25 17:57:48 2021 +0000

    Fix load revision jobs not failing if the extraction of data fails
---
 guix-data-service/jobs/load-new-guix-revision.scm | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm 
b/guix-data-service/jobs/load-new-guix-revision.scm
index 50eef74..04e030c 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -1370,27 +1370,27 @@ WHERE job_id = $1")
             store
             channel-derivations-by-system)))
       (if store-item
-          (begin
-            (extract-information-from conn store
-                                      guix-revision-id
-                                      commit store-item)
-
-            (if (defined? 'channel-news-for-commit
-                  (resolve-module '(guix channels)))
-                (with-time-logging "inserting channel news entries"
-                  (insert-channel-news-entries-for-guix-revision
-                   conn
-                   guix-revision-id
-                   (channel-news-for-commit channel-for-commit commit)))
-                (begin
-                  (simple-format
-                   #t "debug: importing channel news not supported\n")
-                  #t))
-
-            (update-package-derivations-table conn
-                                              git-repository-id
-                                              guix-revision-id
-                                              commit))
+          (and
+           (extract-information-from conn store
+                                     guix-revision-id
+                                     commit store-item)
+
+           (if (defined? 'channel-news-for-commit
+                 (resolve-module '(guix channels)))
+               (with-time-logging "inserting channel news entries"
+                 (insert-channel-news-entries-for-guix-revision
+                  conn
+                  guix-revision-id
+                  (channel-news-for-commit channel-for-commit commit)))
+               (begin
+                 (simple-format
+                  #t "debug: importing channel news not supported\n")
+                 #t))
+
+           (update-package-derivations-table conn
+                                             git-repository-id
+                                             guix-revision-id
+                                             commit))
           (begin
             (simple-format #t "Failed to generate store item for ~A\n"
                            commit)