From b13726dd98c0a3294ff02ff0714035cc39e478b1 Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Sat, 21 Sep 2024 12:23:20 +0200 Subject: [PATCH] Rename two remote variables confusingly named 'generations'. Both refer to data sets returned from the remote expression, and one of them shadowed an element of itself. * gnu/machine/ssh.scm (machine->boot-alternatives): Rename generations to remote-results. Change-Id: Ibd8a3036126d9da1215cfc191884c0f54df637df --- gnu/machine/ssh.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index fae42ad3ce..efe056dab7 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -451,10 +451,11 @@ (define (read-file path) (read-file boot-parameters-path)))) (reverse (generation-numbers %system-profile))))))) - (mlet* %store-monad ((generations (machine-remote-eval machine remote-exp))) + (mlet %store-monad + ((remote-results (machine-remote-eval machine remote-exp))) (return - (map (lambda (generation) - (match generation + (map (lambda (remote-result) + (match remote-result ((generation system-path epoch serialized-params) (let* ((params (call-with-input-string serialized-params read-boot-parameters)) @@ -467,7 +468,7 @@ (define (read-file path) (kernel-arguments (append (bootable-kernel-arguments system-path root version) (boot-parameters-kernel-arguments params)))))))) - generations)))) + remote-results)))) (define-syntax-rule (with-roll-back should-roll-back? mbody ...) "Catch exceptions that arise when binding MBODY, a monadic expression in