2
0
Fork 0
mirror of git://git.savannah.gnu.org/guix/data-service.git synced 2023-12-14 03:23:03 +01:00

Better handle loading the (guix i18n) module in the inferior

Previously it would only be loaded if the (guix lint) module exists.
This commit is contained in:
Christopher Baines 2020-09-26 16:07:53 +01:00
parent faf46565ce
commit 6bc1da014f

View file

@ -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