cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle #f package descriptions

Browse source 
One was added in e81cf4e79a6e297db0ae2a9c39eab495e7e204f0.
This commit is contained in:
Christopher Baines 2021-08-09 09:43:03 +01:00
parent 5cefa250d8
commit 52094f5f19
1 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

53
guix-data-service/model/package-metadata.scm
View file

@ -237,7 +237,8 @@ WHERE packages.id IN (
(source-description (source-description
(begin (begin
(setlocale LC_MESSAGES source-locale) (setlocale LC_MESSAGES source-locale)
(P_ (package-description package)))) (and=> (package-description package)
P_)))
(synopsis-by-locale (synopsis-by-locale
(filter-map (filter-map
(lambda (locale) (lambda (locale)
@ -258,29 +259,33 @@ WHERE packages.id IN (
(cons locale synopsis)))) (cons locale synopsis))))
(list ,@locales))) (list ,@locales)))
(descriptions-by-locale (descriptions-by-locale
(filter-map (if (string? source-description)
(lambda (locale) (filter-map
(catch 'system-error (lambda (locale)
(lambda () (catch 'system-error
(setlocale LC_MESSAGES locale)) (lambda ()
(lambda (key . args) (setlocale LC_MESSAGES locale))
(error (lambda (key . args)
(simple-format (error
#f (simple-format
"error changing locale to ~A: ~A ~A" #f
locale key args)))) "error changing locale to ~A: ~A ~A"
(let ((description locale key args))))
(P_ (package-description package)))) (let ((description
(setlocale LC_MESSAGES source-locale) (P_ (package-description package))))
(if (string=? description source-description) (setlocale LC_MESSAGES source-locale)
#f (if (string=? description source-description)
(cons locale description)))) #f
(list ,@locales)))) (cons locale description))))
(cons (list ,@locales))
(cons (cons source-locale source-description) ;; Could be #f
descriptions-by-locale) '())))
(cons (cons source-locale source-synopsis) (cons
synopsis-by-locale)))) ;; Pretend that #f descriptions are ""
(cons (cons source-locale (or source-description ""))
descriptions-by-locale)
(cons (cons source-locale source-synopsis)
synopsis-by-locale))))
(inferior-eval (translate (inferior-package-id inferior-package)) inferior)) (inferior-eval (translate (inferior-package-id inferior-package)) inferior))