[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69343] [PATCH v4 07/11] Rename two remote variables confusingly nam
From: |
Lilah Tascheter |
Subject: |
[bug#69343] [PATCH v4 07/11] Rename two remote variables confusingly named 'generations'. |
Date: |
Thu, 19 Sep 2024 23:16:01 -0500 |
From: Felix Lechner <felix.lechner@lease-up.com>
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 f3d2a77625..a96ca68f47 100644
--- a/gnu/machine/ssh.scm
+++ b/gnu/machine/ssh.scm
@@ -449,10 +449,11 @@ (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))
@@ -465,7 +466,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.45.2
- [bug#69343] [PATCH v4 00/11] Simplify bootloader data structures and procedures, Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 01/11] Fix bug where the extra menu entries for a bootloader were shown twice., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 04/11] Move epoch->date-string to gnu/system/boot.scm and use it elsewhere., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 11/11] Encapsulate <boot-parameters> to retain generation, system-path and epoch., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 10/11] Split generation->boot-parameters out of profile->boot-alternatives., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 03/11] Rename seconds->string procedure to epoch->date-string., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 05/11] Offer a uniform decorated-boot-label and use it., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 02/11] Move <boot-parameters> record to a separate file., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 09/11] Simplify profile->boot-alternatives., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 07/11] Rename two remote variables confusingly named 'generations'.,
Lilah Tascheter <=
- [bug#69343] [PATCH v4 08/11] Give a separate name to a commonly used expression., Lilah Tascheter, 2024/09/20
- [bug#69343] [PATCH v4 06/11] Rename boot-parameters to boot-alternatives when appropriate., Lilah Tascheter, 2024/09/20