From f118ed0bf9a4ed9e94722399a787a46f9b0304eb Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 1 Sep 2019 12:35:10 +0100 Subject: Improve handling of errors when changing locale In the load-new-guix-revision module. --- guix-data-service/jobs/load-new-guix-revision.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index a138b12..3c2fb45 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -265,14 +265,22 @@ WHERE job_id = $1" (messages-by-locale (filter-map (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 (lint-warning-message lint-warning))) + (setlocale LC_MESSAGES source-locale) (if (string=? message source-message) #f (cons locale message)))) (list ,@locales)))) - (setlocale LC_MESSAGES "") (cons (cons source-locale source-message) messages-by-locale)))) (check package)))) -- cgit v1.2.3