From 3ee481110ec0f821b4f0342bf8ab498b55d77e79 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 9 Feb 2020 10:20:36 +0000 Subject: Shift extracting channel news to later on To avoid race conditions between jobs, have it happen after the call to extract-information-from. --- guix-data-service/jobs/load-new-guix-revision.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 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 e494485..dff4f88 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -1135,18 +1135,21 @@ ORDER BY packages.name, packages.version" commit store-item))) (and guix-revision-id + (extract-information-from conn guix-revision-id + commit store-item) (if (defined? 'channel-news-for-commit (resolve-module '(guix channels))) - (insert-channel-news-entries-for-guix-revision - conn - guix-revision-id - (channel-news-for-commit channel-for-commit commit)) + (log-time + "inserting channel news entries" + (lambda () + (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)) - (extract-information-from conn guix-revision-id - commit store-item) (update-package-versions-table conn git-repository-id commit) (update-package-derivations-table conn git-repository-id -- cgit v1.2.3