diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-06-03 12:33:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-06-03 13:04:20 +0200 |
| commit | fe509e017fa1c0e3d0b057784b081def3aa621ad (patch) | |
| tree | 86eeb92a86daef10c41734f81cd0da570c7fda8e /gnu/machine | |
| parent | 0928e552662965f5a18fbc831e6c9758744bd042 (diff) | |
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.
Diffstat (limited to 'gnu/machine')
| -rw-r--r-- | gnu/machine/ssh.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 93b0a007dab..ecd02e336c1 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm | |||
| @@ -459,7 +459,8 @@ have you run 'guix archive --generate-key?'") | |||
| 459 | (lambda (store) | 459 | (lambda (store) |
| 460 | (guard (condition ((inferior-exception? condition) | 460 | (guard (condition ((inferior-exception? condition) |
| 461 | (values (begin handler ...) store))) | 461 | (values (begin handler ...) store))) |
| 462 | (run-with-store store (eval exp)))))) | 462 | (values (run-with-store store (eval exp)) |
| 463 | store))))) | ||
| 463 | 464 | ||
| 464 | (mbegin %store-monad | 465 | (mbegin %store-monad |
| 465 | (with-roll-back #f | 466 | (with-roll-back #f |