WIP

1 files changed, 12 insertions, 18 deletions

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 643df0a..c56e897 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -897,21 +897,6 @@ WHERE job_id = $1"
         (lambda (key . args)
           (display-backtrace (make-stack #t) (current-error-port)))))))
 
-
-(define (store-item-for-git-repository-id-and-commit
-         conn git-repository-id commit)
-  (with-store store
-    (set-build-options store
-                       #:fallback? #t)
-    (channel->guix-store-item
-     conn
-     store
-     (channel (name 'guix)
-              (url (git-repository-id->url
-                    conn
-                    git-repository-id))
-              (commit commit)))))
-
 (define (update-package-versions-table conn git-repository-id commit)
   ;; Lock the table to wait for other transactions to commit before updating
   ;; the table
@@ -1045,9 +1030,18 @@ ORDER BY packages.name, packages.version"
   #t)
 
 (define (load-new-guix-revision conn git-repository-id commit)
-  (let ((store-item
-         (store-item-for-git-repository-id-and-commit
-          conn git-repository-id commit)))
+  (let* ((channel-for-commit
+          (channel (name 'guix)
+                   (url (git-repository-id->url
+                         conn
+                         git-repository-id))
+                   (commit commit)))
+         (store-item
+          (with-store store
+            (set-build-options store #:fallback? #t)
+            (channel->guix-store-item conn
+                                      store
+                                      channel-for-commit))))
     (if store-item
         (and
          (extract-information-from conn git-repository-id