diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-02-23 22:22:59 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-02-24 19:00:46 +0000 |
| commit | 34a92e4c16a93a524f33a301bbc668c511cb5055 (patch) | |
| tree | b2b104830326c489a8ceaf4fed77fcefaeae405c /guix-data-service | |
| parent | f57b5c4a9a932f77952585f547671c12d8103b02 (diff) | |
| download | data-service-34a92e4c16a93a524f33a301bbc668c511cb5055.tar data-service-34a92e4c16a93a524f33a301bbc668c511cb5055.tar.gz | |
Adapt some license related code to work without mock in the tests
With Guile 3, there's a potential for mock to work in even fewer
circumstances. So, adapt the code to enable writing the tests without mock.
Diffstat (limited to 'guix-data-service')
| -rw-r--r-- | guix-data-service/jobs/load-new-guix-revision.scm | 8 | ||||
| -rw-r--r-- | guix-data-service/model/license-set.scm | 5 | ||||
| -rw-r--r-- | guix-data-service/model/license.scm | 8 |
3 files changed, 10 insertions, 11 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 620a3a6..7001333 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -44,6 +44,7 @@ #:use-module (guix-data-service model guix-revision) #:use-module (guix-data-service model package-derivation) #:use-module (guix-data-service model guix-revision-package-derivation) + #:use-module (guix-data-service model license) #:use-module (guix-data-service model license-set) #:use-module (guix-data-service model lint-checker) #:use-module (guix-data-service model lint-warning) @@ -639,8 +640,11 @@ WHERE job_id = $1" (let* ((package-license-set-ids (log-time "fetching inferior package license metadata" (lambda () - (inferior-packages->license-set-ids conn inf - packages)))) + (inferior-packages->license-set-ids + conn + (inferior-packages->license-id-lists + conn + (inferior-packages->license-data inf packages)))))) (packages-metadata-ids (log-time "fetching inferior package metadata" (lambda () diff --git a/guix-data-service/model/license-set.scm b/guix-data-service/model/license-set.scm index e88297c..7f23eaf 100644 --- a/guix-data-service/model/license-set.scm +++ b/guix-data-service/model/license-set.scm @@ -44,10 +44,7 @@ FROM license_sets") ", ") " RETURNING id")) -(define (inferior-packages->license-set-ids conn inf packages) - (define license-id-lists - (inferior-packages->license-id-lists conn inf packages)) - +(define (inferior-packages->license-set-ids conn license-id-lists) (let* ((unique-license-id-lists (delete-duplicates license-id-lists)) (existing-license-sets diff --git a/guix-data-service/model/license.scm b/guix-data-service/model/license.scm index 0bf35f3..9104882 100644 --- a/guix-data-service/model/license.scm +++ b/guix-data-service/model/license.scm @@ -22,7 +22,8 @@ #:use-module (squee) #:use-module (guix inferior) #:use-module (guix-data-service model utils) - #:export (inferior-packages->license-id-lists)) + #:export (inferior-packages->license-id-lists + inferior-packages->license-data)) (define inferior-package-id (@@ (guix inferior) inferior-package-id)) @@ -61,10 +62,7 @@ (inferior-eval '(use-modules (guix licenses)) inf) (inferior-eval (proc packages) inf)) -(define (inferior-packages->license-id-lists conn inf packages) - (define license-data - (inferior-packages->license-data inf packages)) - +(define (inferior-packages->license-id-lists conn license-data) (define (string-or-null v) (if (string? v) v |