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

guix system: Properly report Shepherd errors when upgrading services. 

Fixes regression introduced in 8bf92e3904.
Reported by myglc2 <myglc2@gmail.com> in <http://bugs.gnu.org/24135>.

* guix/scripts/system.scm (with-shepherd-error-handling): Rename 'body'
to 'mbody'.  Expand to a monadic procedure that runs MBODY.
This commit is contained in:
Ludovic Courtès 2016-08-02 22:57:09 +02:00
parent e8b652d46b
commit aa1e73a996
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guix/scripts/system.scm
View File

@ -236,11 +236,15 @@ BODY..., and restore them."
(with-monad %store-monad
(return #f)))))
(define-syntax-rule (with-shepherd-error-handling body ...)
(warn-on-system-error
(guard (c ((shepherd-error? c)
(report-shepherd-error c)))
body ...)))
(define-syntax-rule (with-shepherd-error-handling mbody ...)
"Catch and report Shepherd errors that arise when binding MBODY, a monadic
expression in %STORE-MONAD."
(lambda (store)
(warn-on-system-error
(guard (c ((shepherd-error? c)
(report-shepherd-error c)))
(values (run-with-store store (begin mbody ...))
store)))))
(define (report-shepherd-error error)
"Report ERROR, a '&shepherd-error' error condition object."