diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-01-02 10:06:27 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-01-02 10:06:27 +0000 |
| commit | 64a4058ccece46c89a39c639c1ab509810c2a403 (patch) | |
| tree | e038aa47000e4ba492a97c18ed76bc7ce0f12e55 /guix-data-service/comparison.scm | |
| parent | 7df6f92036149db03ab567b36ca53d1270d17c98 (diff) | |
| download | data-service-64a4058ccece46c89a39c639c1ab509810c2a403.tar data-service-64a4058ccece46c89a39c639c1ab509810c2a403.tar.gz | |
Start to add compatibility with squee returning #f for null values
While maintaining compatibility for older versions of squee.
Diffstat (limited to 'guix-data-service/comparison.scm')
| -rw-r--r-- | guix-data-service/comparison.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/guix-data-service/comparison.scm b/guix-data-service/comparison.scm index 470c14e..dbccb81 100644 --- a/guix-data-service/comparison.scm +++ b/guix-data-service/comparison.scm @@ -548,7 +548,8 @@ ORDER BY coalesce(base_packages.name, target_packages.name) ASC, base_packages.v (define (package-data->package-data-vhashes package-data) (define (add-data-to-vhash data vhash) (let ((key (first data))) - (if (string-null? key) + (if (or (eq? #f key) + (string-null? key)) vhash (vhash-cons key (drop data 1) @@ -567,7 +568,8 @@ ORDER BY coalesce(base_packages.name, target_packages.name) ASC, base_packages.v (define (package-derivation-data->package-derivation-data-vhashes package-data) (define (add-data-to-vhash data vhash) (let ((key (first data))) - (if (string-null? key) + (if (or (eq? key #f) + (string-null? key)) vhash (vhash-cons key (drop data 1) @@ -600,7 +602,8 @@ ORDER BY coalesce(base_packages.name, target_packages.name) ASC, base_packages.v '() (map (match-lambda ((base-name base-version _ _ _ _ _ target-name target-version _ _ _ _ _) - (if (string-null? base-name) + (if (or (and (string? base-name) (string-null? base-name)) + (eq? base-name #f)) (cons target-name target-version) (cons base-name base-version)))) package-data)))) @@ -733,7 +736,9 @@ ORDER BY coalesce(base_packages.name, target_packages.name) ASC, base_packages.v `((system . ,system) (target . ,target) (derivation-file-name . ,derivation-file-name) - (builds . ,(if (string-null? builds) + (builds . ,(if (or (and (string? builds) + (string-null? builds)) + (eq? #f builds)) #() (json-string->scm builds)))))) ,@(derivation-system-and-target-list->alist (cdr lst))))) |