From 2e8ca7f547800f1455214be24525ff64ea095e4a Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 18 Nov 2019 19:52:36 +0000
Subject: Extract out creating the guix-revision from extract-information-from

To allow for using the guix-revision-id when inserting channel news entries.
---
 guix-data-service/jobs/load-new-guix-revision.scm | 78 +++++++++++------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index a374a6e..d5e1add 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -741,7 +741,7 @@ WHERE job_id = $1"
 
       output)))
 
-(define (extract-information-from conn git-repository-id commit store-path)
+(define (extract-information-from conn guix-revision-id commit store-path)
   (simple-format
    #t "debug: extract-information-from: ~A\n" store-path)
   (with-store store
@@ -854,39 +854,35 @@ WHERE job_id = $1"
                #t "debug: finished loading information from inferior\n")
               (close-inferior inf)
 
-              (let ((guix-revision-id
-                     (insert-guix-revision conn git-repository-id
-                                           commit store-path)))
-
-                (when inferior-lint-warnings
-                  (let* ((lint-checker-ids
-                          (lint-checkers->lint-checker-ids
-                           conn
-                           (map car inferior-lint-warnings)))
-                         (lint-warning-ids
-                          (insert-lint-warnings
-                           conn
-                           inferior-package-id->package-database-id
-                           lint-checker-ids
-                           inferior-lint-warnings)))
-                    (insert-guix-revision-lint-checkers conn
-                                                        guix-revision-id
-                                                        lint-checker-ids)
-
-                    (insert-guix-revision-lint-warnings conn
-                                                        guix-revision-id
-                                                        lint-warning-ids)))
-                (let ((package-derivation-ids
-                       (inferior-data->package-derivation-ids
-                        conn inf inferior-package-id->package-database-id
-                        inferior-data-4-tuples)))
-
-                  (insert-guix-revision-package-derivations conn
-                                                            guix-revision-id
-                                                            package-derivation-ids)
-                  (simple-format
-                   #t "Successfully loaded ~A package/derivation pairs\n"
-                   (length package-derivation-ids))))))
+              (when inferior-lint-warnings
+                (let* ((lint-checker-ids
+                        (lint-checkers->lint-checker-ids
+                         conn
+                         (map car inferior-lint-warnings)))
+                       (lint-warning-ids
+                        (insert-lint-warnings
+                         conn
+                         inferior-package-id->package-database-id
+                         lint-checker-ids
+                         inferior-lint-warnings)))
+                  (insert-guix-revision-lint-checkers conn
+                                                      guix-revision-id
+                                                      lint-checker-ids)
+
+                  (insert-guix-revision-lint-warnings conn
+                                                      guix-revision-id
+                                                      lint-warning-ids)))
+              (let ((package-derivation-ids
+                     (inferior-data->package-derivation-ids
+                      conn inf inferior-package-id->package-database-id
+                      inferior-data-4-tuples)))
+
+                (insert-guix-revision-package-derivations conn
+                                                          guix-revision-id
+                                                          package-derivation-ids)
+                (simple-format
+                 #t "Successfully loaded ~A package/derivation pairs\n"
+                 (length package-derivation-ids)))))
           #t)
         (lambda (key . args)
           (simple-format (current-error-port)
@@ -1046,11 +1042,15 @@ ORDER BY packages.name, packages.version"
          (store-item
           (store-item-for-channel conn channel-for-commit)))
     (if store-item
-        (and
-         (extract-information-from conn git-repository-id
-                                   commit store-item)
-         (update-package-versions-table conn git-repository-id commit)
-         (update-package-derivations-table conn git-repository-id commit))
+        (let ((guix-revision-id
+               (insert-guix-revision conn git-repository-id
+                                     commit store-item)))
+          (and
+           guix-revision-id
+           (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 commit)))
         (begin
           (simple-format #t "Failed to generate store item for ~A\n"
                          commit)
-- 
cgit v1.2.3