Tweak some post extract-information-from actionsHEADmaster

Move update-package-derivations-table further on since it locks a table, and
use let for the guix-revision-id.

1 files changed, 30 insertions, 28 deletions

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 5858ae2..618ec25 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -2604,35 +2604,37 @@ SELECT store_path FROM derivation_source_files WHERE id = $1"
                                      #:ignore-systems ignore-systems
                                      #:ignore-targets ignore-targets
                                      #:parallelism parallelism)
+           (let ((guix-revision-id
+                  (fibers-force guix-revision-id-promise)))
+             (and
+              (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
-                  (fibers-force guix-revision-id-promise)
-                  (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
-            (fibers-force guix-revision-id-promise)
-            commit)
-           (with-time-logging "updating builds.derivation_output_details_set_id"
-             (update-builds-derivation-output-details-set-id
-              conn
-              (fibers-force guix-revision-id-promise)))
-           (let ((stats (gc-stats)))
-             (format (current-error-port)
-                     "gc-stats: time taken: ~3fs, times: ~d~%"
-                     (/ (assq-ref stats 'gc-time-taken)
-                        internal-time-units-per-second)
-                     (assq-ref stats 'gc-times))
-             #t))
+              (with-time-logging "updating builds.derivation_output_details_set_id"
+                (update-builds-derivation-output-details-set-id
+                 conn
+                 guix-revision-id))
+              (update-package-derivations-table
+               conn
+               git-repository-id
+               guix-revision-id
+               commit)
+              (let ((stats (gc-stats)))
+                (format (current-error-port)
+                        "gc-stats: time taken: ~3fs, times: ~d~%"
+                        (/ (assq-ref stats 'gc-time-taken)
+                           internal-time-units-per-second)
+                        (assq-ref stats 'gc-times))
+                #t))))
           (begin
             (simple-format #t "Failed to generate store item for ~A\n"
                            commit)