diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-12-27 12:05:24 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2020-12-27 12:06:49 +0100 |
| commit | 5aae614868b8a7e3097ae70f6024352aa5c8de21 (patch) | |
| tree | d0ec0f75455e2c4615a0c47fe03b9af960bc7e41 /guix | |
| parent | 649786f0cbd69083c7ae33ae1d441c19b68fc0ab (diff) | |
| download | guix-patches-5aae614868b8a7e3097ae70f6024352aa5c8de21.tar guix-patches-5aae614868b8a7e3097ae70f6024352aa5c8de21.tar.gz | |
import/utils: alist->package: Handle SPDX license names only as fallback.
Fixes <https://bugs.gnu.org/45453>.
* guix/import/utils.scm (alist->package): Find plain license names in (guix
licenses) first, and only fall back to SPDX names on error.
* tests/import-utils.scm ("alist->package with SPDX license name 1/2",
"alist->package with SPDX license name 2/2"): New tests.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/import/utils.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/import/utils.scm b/guix/import/utils.scm index e227c2e42d..cdbcf6bfa5 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -372,8 +372,12 @@ specifications to look up and replace them with plain symbols instead." (match (assoc-ref meta "license") (#f #f) (l - (or (module-ref (resolve-interface '(guix licenses) #:prefix 'license:) - (spdx-string->license l)) + (or (false-if-exception + (module-ref (resolve-interface '(guix licenses)) + (string->symbol l))) + (false-if-exception + (module-ref (resolve-interface '(guix licenses) #:prefix 'license:) + (spdx-string->license l))) (license:fsdg-compatible l))))))) (define* (read-lines #:optional (port (current-input-port))) |