From 410f58cb43f083623885a430700c6818a187cadc Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 25 Mar 2021 17:57:48 +0000 Subject: [PATCH] Fix load revision jobs not failing if the extraction of data fails --- .../jobs/load-new-guix-revision.scm | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 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) + (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)) + (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)) + (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)