diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-08-02 23:51:12 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-08-02 23:51:12 +0200 |
| commit | 9d1e56b76dc225373598d8d92c9d5f75eeba49ee (patch) | |
| tree | 71ca11110cc5ded66215c525932de3be07e51d12 | |
| parent | 35c4aec88db70e3ce450a0bf8e097ac215df20d1 (diff) | |
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.scm | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ expression in %STORE-MONAD." | |||
| 242 | (lambda (store) | 242 | (lambda (store) |
| 243 | (warn-on-system-error | 243 | (warn-on-system-error |
| 244 | (guard (c ((shepherd-error? c) | 244 | (guard (c ((shepherd-error? c) |
| 245 | (report-shepherd-error c))) | 245 | (values (report-shepherd-error c) store))) |
| 246 | (values (run-with-store store (begin mbody ...)) | 246 | (values (run-with-store store (begin mbody ...)) |
| 247 | store))))) | 247 | store))))) |
| 248 | 248 | ||