nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

import: crate: Gracefully deal with missing license info. 

Reported by Fis Trivial <ybbs.daans@hotmail.com>.
Fixes <https://bugs.gnu.org/28987>.

* guix/import/crate.scm (crate-fetch): Check whether the "license" info
is present.
This commit is contained in:
Ludovic Courtès 2018-01-08 11:45:35 +01:00
parent f4596f7630
commit 1e63ecee0b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/import/crate.scm
View File

@ -59,7 +59,9 @@
(repository (assoc-ref crate "repository")) (repository (assoc-ref crate "repository"))
(synopsis (assoc-ref crate "description")) (synopsis (assoc-ref crate "description"))
(description (assoc-ref crate "description")) (description (assoc-ref crate "description"))
(license (string->license (assoc-ref crate "license"))) (license (or (and=> (assoc-ref crate "license")
string->license)
'())) ;missing license info
(path (string-append "/" version "/dependencies")) (path (string-append "/" version "/dependencies"))
(deps-json (json-fetch (string-append crate-url name path))) (deps-json (json-fetch (string-append crate-url name path)))
(deps (assoc-ref deps-json "dependencies")) (deps (assoc-ref deps-json "dependencies"))