diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-02-09 21:06:12 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-02-09 21:06:12 +0000 |
| commit | 60d53f898fb390fff70fcc4c7cf3d2c563b19f9c (patch) | |
| tree | b874ab5e017a7dae9f666f11b4a29f7efbc72533 | |
| parent | 13b0ebe561094285589eb5d0f6f08e7256cc2529 (diff) | |
| download | data-service-60d53f898fb390fff70fcc4c7cf3d2c563b19f9c.tar data-service-60d53f898fb390fff70fcc4c7cf3d2c563b19f9c.tar.gz | |
Collpase store-item-for-channel in to channel->guix-store-item
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 9d2992b..e767e07 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -884,16 +884,18 @@ WHERE job_id = $1" (build-derivations store (list derivation)))) (derivation->output-path derivation))) -(define (channel->guix-store-item conn store channel) +(define (channel->guix-store-item conn channel) (catch #t (lambda () - (dirname - (readlink - (string-append (channel->manifest-store-item conn - store - channel) - "/bin")))) + (with-store store + (set-build-options store #:fallback? #t) + (dirname + (readlink + (string-append (channel->manifest-store-item conn + store + channel) + "/bin"))))) (lambda args (simple-format #t "guix-data-service: load-new-guix-revision: error: ~A\n" args) #f))) @@ -1177,13 +1179,6 @@ ORDER BY packages.name, packages.version" #t) -(define (store-item-for-channel conn channel) - (with-store store - (set-build-options store #:fallback? #t) - (channel->guix-store-item conn - store - channel))) - (define (load-new-guix-revision conn git-repository-id commit) (let* ((channel-for-commit (channel (name 'guix) @@ -1192,7 +1187,7 @@ ORDER BY packages.name, packages.version" git-repository-id)) (commit commit))) (store-item - (store-item-for-channel conn channel-for-commit))) + (channel->guix-store-item conn channel-for-commit))) (if store-item (let ((guix-revision-id (insert-guix-revision conn git-repository-id |