summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-08-02 23:51:12 +0200
committerLudovic Courtès <ludo@gnu.org>2016-08-02 23:51:12 +0200
commit9d1e56b76dc225373598d8d92c9d5f75eeba49ee (patch)
tree71ca11110cc5ded66215c525932de3be07e51d12
parent35c4aec88db70e3ce450a0bf8e097ac215df20d1 (diff)
downloadguix-9d1e56b76dc225373598d8d92c9d5f75eeba49ee.tar.gz
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.
-rw-r--r--guix/scripts/system.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 992acdbca2..209ebf9752 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)))))