[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69343] [PATCH 08/12] Rename two remote variables confusingly named
From: |
Felix Lechner |
Subject: |
[bug#69343] [PATCH 08/12] Rename two remote variables confusingly named 'generations'. |
Date: |
Fri, 23 Feb 2024 17:51:41 -0800 |
Both refer to data sets returned from the remote expression, and one of them
shadowed an element of itself.
Change-Id: Ibd8a3036126d9da1215cfc191884c0f54df637df
---
gnu/machine/ssh.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm
index 11534c6740..9adb5e79b9 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -451,10 +451,10 @@ (define (machine->boot-alternatives machine)
(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 +467,7 @@ (define (machine->boot-alternatives machine)
(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
--
2.41.0
- [bug#69343] [PATCH 00/12] Simplify bootloader data structures and procedures, Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 03/12] Also move boot-parameters->menu-entry., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 11/12] Split generation->boot-parameters out of profile->boot-alternatives., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 08/12] Rename two remote variables confusingly named 'generations'.,
Felix Lechner <=
- [bug#69343] [PATCH 09/12] Give a separate name to a commonly used expression., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 04/12] Rename seconds->string procedure to epoch->date-string., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 10/12] Simplify profile->boot-alternatives., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 06/12] Offer a uniform decorated-boot-label and use it., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 05/12] Move epoch->date-string to gnu/system/boot.scm and use it elsewhere., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 01/12] Fix bug where the extra menu entries for a bootloader were shown twice., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 12/12] Encapsulate <boot-parameters> to retain generation, system-path and epoch., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 07/12] Rename boot-parameters to boot-alternatives when appropriate., Felix Lechner, 2024/02/23
- [bug#69343] [PATCH 02/12] Move <boot-parameters> record to a separate file., Felix Lechner, 2024/02/23