ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename two remote variables confusingly named 'generations'.

Browse source 
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
This commit is contained in:
Felix Lechner 2024-09-21 12:23:20 +02:00 committed by Ryan Schanzenbacher
parent 02b0324822
commit b13726dd98
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/machine/ssh.scm
View file

@ -451,10 +451,11 @@ (define (read-file path)
(read-file boot-parameters-path)))) (read-file boot-parameters-path))))
(reverse (generation-numbers %system-profile))))))) (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 (return
(map (lambda (generation) (map (lambda (remote-result)
(match generation (match remote-result
((generation system-path epoch serialized-params) ((generation system-path epoch serialized-params)
(let* ((params (call-with-input-string serialized-params (let* ((params (call-with-input-string serialized-params
read-boot-parameters)) read-boot-parameters))
@ -467,7 +468,7 @@ (define (read-file path)
(kernel-arguments (kernel-arguments
(append (bootable-kernel-arguments system-path root version) (append (bootable-kernel-arguments system-path root version)
(boot-parameters-kernel-arguments params)))))))) (boot-parameters-kernel-arguments params))))))))
generations)))) remote-results))))
(define-syntax-rule (with-roll-back should-roll-back? mbody ...) (define-syntax-rule (with-roll-back should-roll-back? mbody ...)
"Catch exceptions that arise when binding MBODY, a monadic expression in "Catch exceptions that arise when binding MBODY, a monadic expression in