[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Handle #f package descriptions
From: |
Christopher Baines |
Subject: |
branch master updated: Handle #f package descriptions |
Date: |
Mon, 09 Aug 2021 04:43:26 -0400 |
This is an automated email from the git hooks/post-receive script.
cbaines pushed a commit to branch master
in repository data-service.
The following commit(s) were added to refs/heads/master by this push:
new 52094f5 Handle #f package descriptions
52094f5 is described below
commit 52094f5f19c013c88ff39f70b9d759159a458b41
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Mon Aug 9 09:43:03 2021 +0100
Handle #f package descriptions
One was added in e81cf4e79a6e297db0ae2a9c39eab495e7e204f0.
---
guix-data-service/model/package-metadata.scm | 53 +++++++++++++++-------------
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/guix-data-service/model/package-metadata.scm
b/guix-data-service/model/package-metadata.scm
index 912d0c2..e9e426c 100644
--- a/guix-data-service/model/package-metadata.scm
+++ b/guix-data-service/model/package-metadata.scm
@@ -237,7 +237,8 @@ WHERE packages.id IN (
(source-description
(begin
(setlocale LC_MESSAGES source-locale)
- (P_ (package-description package))))
+ (and=> (package-description package)
+ P_)))
(synopsis-by-locale
(filter-map
(lambda (locale)
@@ -258,29 +259,33 @@ WHERE packages.id IN (
(cons locale synopsis))))
(list ,@locales)))
(descriptions-by-locale
- (filter-map
- (lambda (locale)
- (catch 'system-error
- (lambda ()
- (setlocale LC_MESSAGES locale))
- (lambda (key . args)
- (error
- (simple-format
- #f
- "error changing locale to ~A: ~A ~A"
- locale key args))))
- (let ((description
- (P_ (package-description package))))
- (setlocale LC_MESSAGES source-locale)
- (if (string=? description source-description)
- #f
- (cons locale description))))
- (list ,@locales))))
- (cons
- (cons (cons source-locale source-description)
- descriptions-by-locale)
- (cons (cons source-locale source-synopsis)
- synopsis-by-locale))))
+ (if (string? source-description)
+ (filter-map
+ (lambda (locale)
+ (catch 'system-error
+ (lambda ()
+ (setlocale LC_MESSAGES locale))
+ (lambda (key . args)
+ (error
+ (simple-format
+ #f
+ "error changing locale to ~A: ~A ~A"
+ locale key args))))
+ (let ((description
+ (P_ (package-description package))))
+ (setlocale LC_MESSAGES source-locale)
+ (if (string=? description source-description)
+ #f
+ (cons locale description))))
+ (list ,@locales))
+ ;; Could be #f
+ '())))
+ (cons
+ ;; 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Handle #f package descriptions,
Christopher Baines <=