summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-06-03 12:33:08 +0200
committerLudovic Courtès <ludo@gnu.org>2021-06-03 13:04:20 +0200
commitfe509e017fa1c0e3d0b057784b081def3aa621ad (patch)
tree86eeb92a86daef10c41734f81cd0da570c7fda8e
parent0928e552662965f5a18fbc831e6c9758744bd042 (diff)
downloadguix-fe509e017fa1c0e3d0b057784b081def3aa621ad.tar.gz
machine: ssh: Respect calling convention for monadic procedures.
Fixes a regression introduced in
2885c3568edec35086f8feeae5b60259cbea407c.

Reported by Mathieu Othacehe.

* gnu/machine/ssh.scm (deploy-managed-host)[eval/error-handling]: Return
two values in the standard case.
-rw-r--r--gnu/machine/ssh.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 93b0a007da..ecd02e336c 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -459,7 +459,8 @@ have you run 'guix archive --generate-key?'")
           (lambda (store)
             (guard (condition ((inferior-exception? condition)
                                (values (begin handler ...) store)))
-              (run-with-store store (eval exp))))))
+              (values (run-with-store store (eval exp))
+                      store)))))
 
       (mbegin %store-monad
         (with-roll-back #f