From patchwork Fri Mar 8 08:12:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 61519 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 41D2927BBEA; Fri, 8 Mar 2024 08:26:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D087627BBE2 for ; Fri, 8 Mar 2024 08:26:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riVXz-0003y6-V3; Fri, 08 Mar 2024 03:25:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riVXr-0003u2-Fo for guix-patches@gnu.org; Fri, 08 Mar 2024 03:25:36 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1riVXo-00017o-8Y for guix-patches@gnu.org; Fri, 08 Mar 2024 03:25:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riVYK-0002du-49 for guix-patches@gnu.org; Fri, 08 Mar 2024 03:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v2 08/12] Rename two remote variables confusingly named 'generations'. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 08:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69343@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.17098863359975 (code B ref 69343); Fri, 08 Mar 2024 08:26:04 +0000 Received: (at 69343) by debbugs.gnu.org; 8 Mar 2024 08:25:35 +0000 Received: from localhost ([127.0.0.1]:56395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVXr-0002ao-07 for submit@debbugs.gnu.org; Fri, 08 Mar 2024 03:25:35 -0500 Received: from sendmail.purelymail.com ([34.202.193.197]:50368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVXl-0002ZX-RH for 69343@debbugs.gnu.org; Fri, 08 Mar 2024 03:25:30 -0500 DKIM-Signature: a=rsa-sha256; b=yauvRq6S7ong9hwsJ/XkFL29LKQKXxt5mEzes9e65OFhAuWKpTbxapjIsqZD66/prGoKWqYFg1tXz2BdeOrHM4hbpV5f4Gm0mshT7h1N+ivGf46pzJudGorf8XXIY1hucjnTg2DL4IiFH4CqwCSz3Is18IoWIQe2ZzXjvqqAzM2PL/OzrgKfJrME7BTdLz/IiWpIHP6Ixa1ErTLtPwzkDsWy9QOUZopB7Qqpk/kr7iekGM0adG+43g1Vw8RjEECbXJXiBnPVGuINYm2qofWNq48Kz9rLevAmeVYWGDI8o1YUm/Zs9kjyLp0CkdrrptfOx1NjBTSdpDdM1xozmSurHw==; s=purelymail2; d=lunabee.space; v=1; bh=fPRYDQ1t4FGIKh4qAc65pN2usoZ60twgiozHdseL2O0=; h=Received:From:To:Subject; DKIM-Signature: a=rsa-sha256; b=MvzJidm7h4m60otIxRO2/hkFrTqWzNXV2rCf7OaDpIGgyRgUkoKXvO6Opl5yIPDHoYylnsKmsbWI0clJeM0tRvrbVvCLsT9kpEJ9/imWrrOsWBAZeAUH5IsD8J6Y46FZvyM44hy0JY2CwE4gF8PI1fOMWeHm/RAj4S9EfWKAJelkK+mvLuzSybOiO9Qi1UVW5/Jl79z1TnddqXcrrW9lZShSfRzQxy0IAF0oHgi+OUzFcoL6RNWP/rxIGyfq1eTlL4X9N6tn/enAXdmHNXLGqkp0g2nttFckq079sIdmdQ0ARjbkFE9HKgpYWzq/L+VPxBIC8ynjxPsHOqtk87kL/Q==; s=purelymail2; d=purelymail.com; v=1; bh=fPRYDQ1t4FGIKh4qAc65pN2usoZ60twgiozHdseL2O0=; h=Feedback-ID:Received:From:To:Subject; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 69343@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id 637763825; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 08 Mar 2024 08:24:21 +0000 (UTC) Date: Fri, 8 Mar 2024 02:12:04 -0600 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lilah Tascheter via Guix-patches From: Lilah Tascheter Reply-To: Lilah Tascheter Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Felix Lechner 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 | 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