01/04: machine: ssh: Respect calling convention for monadic procedures.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit fe509e017fa1c0e3d0b057784b081def3aa621ad
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Jun 3 12:33:08 2021 +0200

    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.
---
 gnu/machine/ssh.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 93b0a00..ecd02e3 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