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

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

Browse source 
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
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

@ -452,8 +452,7 @@ WHERE job_id = $1"
(and (and
(or (inferior-eval '(and (resolve-module '(guix lint) #:ensure #f) (or (inferior-eval '(and (resolve-module '(guix lint) #:ensure #f)
(use-modules (guix lint) (use-modules (guix lint))
(guix i18n))
#t) #t)
inf) inf)
(begin (begin
@ -1140,6 +1139,15 @@ WHERE job_id = $1"
(guix derivations) (guix derivations)
(gnu tests)) (gnu tests))
inf) 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) (inferior-eval '(when (defined? '%graft?) (%graft? #f)) inf)
(catch (catch