From 9d1e56b76dc225373598d8d92c9d5f75eeba49ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 2 Aug 2016 23:51:12 +0200
Subject: [PATCH] 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 992acdbca2f..209ebf9752d 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -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)))))
--
GitLab