civodul pushed a commit to branch master
in repository guix.
commit 9d1e56b76dc225373598d8d92c9d5f75eeba49ee
Author: Ludovic Courtès <[email protected]>
Date: Tue Aug 2 23:51:12 2016 +0200
guix system: Fix the Shepherd error handling fix.
This is a followup to aa1e73a996ad170fecac848f203528aeb3d2173e.
* guix/scripts/system.scm (with-shepherd-error-handling): Return two
values when an exception is caught.
---
guix/scripts/system.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 992acdb..209ebf9 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -242,7 +242,7 @@ expression in %STORE-MONAD."
(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)))))
