From 6bc1da014ff726be512c008f79ab11c4deb62038 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 26 Sep 2020 16:07:53 +0100 Subject: [PATCH] Better handle loading the (guix i18n) module in the inferior Previously it would only be loaded if the (guix lint) module exists. --- 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 2d97d65..5ff7be4 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -452,8 +452,7 @@ WHERE job_id = $1" (and (or (inferior-eval '(and (resolve-module '(guix lint) #:ensure #f) - (use-modules (guix lint) - (guix i18n)) + (use-modules (guix lint)) #t) inf) (begin @@ -1140,6 +1139,15 @@ WHERE job_id = $1" (guix derivations) (gnu tests)) inf) + + ;; For G_ and P_ + (or (inferior-eval '(and (resolve-module '(guix i18n) #:ensure #f) + (use-modules (guix i18n)) + #t) + inf) + (inferior-eval '(use-modules (guix ui)) + inf)) + (inferior-eval '(when (defined? '%graft?) (%graft? #f)) inf) (catch