guix system: Fix the Shepherd error handling fix.

This is a followup to aa1e73a996.

* guix/scripts/system.scm (with-shepherd-error-handling): Return two
values when an exception is caught.
This commit is contained in:
Ludovic Courtès 2016-08-02 23:51:12 +02:00
parent 35c4aec88d
commit 9d1e56b76d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -242,7 +242,7 @@ (define-syntax-rule (with-shepherd-error-handling mbody ...)
(lambda (store)
(warn-on-system-error
(guard (c ((shepherd-error? c)
(report-shepherd-error c)))
(values (report-shepherd-error c) store)))
(values (run-with-store store (begin mbody ...))
store)))))