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

Refactor channel->derivation-file-name to reduce line length

Browse source
This commit is contained in:
Christopher Baines 2020-02-09 16:39:46 +00:00
parent 3ee481110e
commit 9c38115c3d
1 changed files with 52 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -719,26 +719,7 @@ WHERE job_id = $1"
'open-inferior/container 'open-inferior/container
(resolve-module '(guix inferior)))) (resolve-module '(guix inferior))))
(let ((inferior (define (start-inferior-and-return-derivation-file-names)
(if use-container?
(open-inferior/container
store
(guix-store-path store)
#:extra-shared-directories
'("/gnu/store")
#:extra-environment-variables
(list (string-append
"SSL_CERT_DIR=" (nss-certs-store-path store))))
(begin
(simple-format #t "debug: using open-inferior\n")
(open-inferior (guix-store-path store)
#:error-port (real-error-port))))))
(catch
#t
(lambda ()
(with-throw-handler #t
(lambda ()
;; /etc is only missing if open-inferior/container has been used ;; /etc is only missing if open-inferior/container has been used
(when use-container? (when use-container?
(inferior-eval (inferior-eval
@ -779,7 +760,8 @@ WHERE job_id = $1"
,(channel-instance-commit channel-instance) ,(channel-instance-commit channel-instance)
,(channel-instance-checkout channel-instance))))) ,(channel-instance-checkout channel-instance)))))
(run-with-store store (run-with-store store
(mlet* %store-monad ((manifest (channel-instances->manifest instances)) (mlet* %store-monad ((manifest (channel-instances->manifest
instances))
(derv (profile-derivation manifest))) (derv (profile-derivation manifest)))
(mbegin %store-monad (mbegin %store-monad
(return (derivation-file-name derv)))))))))) (return (derivation-file-name derv))))))))))
@ -787,6 +769,27 @@ WHERE job_id = $1"
(close-inferior inferior) (close-inferior inferior)
file-name))) file-name)))
(let ((inferior
(if use-container?
(open-inferior/container
store
(guix-store-path store)
#:extra-shared-directories
'("/gnu/store")
#:extra-environment-variables
(list (string-append
"SSL_CERT_DIR=" (nss-certs-store-path store))))
(begin
(simple-format #t "debug: using open-inferior\n")
(open-inferior (guix-store-path store)
#:error-port (real-error-port))))))
(catch
#t
(lambda ()
(with-throw-handler #t
start-inferior-and-return-derivation-file-names
(lambda (key . parameters) (lambda (key . parameters)
(display (backtrace) (current-error-port)) (display (backtrace) (current-error-port))
(display "\n" (current-error-port)) (display "\n" (current-error-port))