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

Improve handling of errors when changing locale

Browse source 
In the load-new-guix-revision module.
This commit is contained in:
Christopher Baines 2019-09-01 12:35:10 +01:00
parent 3a79449974
commit f118ed0bf9
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -265,14 +265,22 @@ WHERE job_id = $1"
(messages-by-locale (messages-by-locale
(filter-map (filter-map
(lambda (locale) (lambda (locale)
(setlocale LC_MESSAGES 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 ((message (let ((message
(lint-warning-message lint-warning))) (lint-warning-message lint-warning)))
(setlocale LC_MESSAGES source-locale)
(if (string=? message source-message) (if (string=? message source-message)
#f #f
(cons locale message)))) (cons locale message))))
(list ,@locales)))) (list ,@locales))))
(setlocale LC_MESSAGES "")
(cons (cons source-locale source-message) (cons (cons source-locale source-message)
messages-by-locale)))) messages-by-locale))))
(check package)))) (check package))))