nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

offload: 'test' gracefully handles 'node-repl-error'. 

Fixes <https://bugs.gnu.org/28057>.
Reported by Ricardo Wurmus <rekado@elephly.net>.

* guix/scripts/offload.scm (assert-node-has-guix): Catch
'node-repl-error' and call 'leave'.
This commit is contained in:
Ludovic Courtès 2018-01-12 22:51:41 +01:00
parent 0e3c8528af
commit 5a5e34e358
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
guix/scripts/offload.scm
View File

@ -551,18 +551,23 @@ slot (which must later be released with 'release-build-slot'), or #f and #f."
(define (assert-node-has-guix node name) (define (assert-node-has-guix node name)
"Bail out if NODE lacks the (guix) module, or if its daemon is not running." "Bail out if NODE lacks the (guix) module, or if its daemon is not running."
(match (node-eval node (catch 'node-repl-error
'(begin (lambda ()
(use-modules (guix)) (match (node-eval node
(with-store store '(begin
(add-text-to-store store "test" (use-modules (guix))
"Hello, build machine!")))) (with-store store
((? string? str) (add-text-to-store store "test"
(info (G_ "Guix is usable on '~a' (test returned ~s)~%") "Hello, build machine!"))))
name str)) ((? string? str)
(x (info (G_ "Guix is usable on '~a' (test returned ~s)~%")
(leave (G_ "failed to use Guix module on '~a' (test returned ~s)~%") name str))
name x)))) (x
(leave (G_ "failed to use Guix module on '~a' (test returned ~s)~%")
name x))))
(lambda (key . args)
(leave (G_ "remove evaluation on '~a' failed:~{ ~s~}~%")
args))))
(define %random-state (define %random-state
(delay (delay