From patchwork Sun Aug 4 03:13:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 66648 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 53FD627BBED; Sun, 4 Aug 2024 04:17:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 BF22727BBEA for ; Sun, 4 Aug 2024 04:17:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saRjx-0003mR-45; Sat, 03 Aug 2024 23:17:01 -0400 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 1saRji-0003kN-L8 for guix-patches@gnu.org; Sat, 03 Aug 2024 23:16:50 -0400 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 1saRji-0002QH-BF for guix-patches@gnu.org; Sat, 03 Aug 2024 23:16:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=FQIV5Ox8Z+GX38pe35gzv0h+S1S6x8OT5fQyhtOFKdU=; b=GYylzN1Iu6Tl6+f2HPJRDCTcz0SQSzrs0Iv47ji2zqQpFBrjVBkk+XVU/bOtkuZEX2fgRnkKDrj1rmbpPiPSE3FBHed/gOUmIF5m0GeK9p2I/5LBncsxCqokrCHLX5G2nlXuC5f4CplDRQm8kn5i3H2gCeur9h7OX5+U0JNosHIgfi1pcUTk046/OLri8bGpgddpAZghcHDv4LwUlRyuh73tC3UYJP00xIS+qOxiCqML/7tvpkjTfj+TX1dfY3phS8tZBEqSjRWLbrsIFnwwbUflqDXSGW+Go9JfqfFywMclGs7Q4JxK/pQ8/ucGcw4MQX8wTC1IcOS/qgKgGL1BCQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1saRk2-0007oK-Mk for guix-patches@gnu.org; Sat, 03 Aug 2024 23:17:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v3 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: Sun, 04 Aug 2024 03:17:06 +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.172274140529826 (code B ref 69343); Sun, 04 Aug 2024 03:17:06 +0000 Received: (at 69343) by debbugs.gnu.org; 4 Aug 2024 03:16:45 +0000 Received: from localhost ([127.0.0.1]:55017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRjg-0007l0-PB for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:16:45 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:56582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRjf-0007kS-7b for 69343@debbugs.gnu.org; Sat, 03 Aug 2024 23:16:43 -0400 DKIM-Signature: a=rsa-sha256; b=ixXog01r+kpMlOje5vqmk9Sx29cVRLsDE68Q0nH0ZblGlHH7q0250at82QU0bcYXIWSbIpyhe2gpO7+OJwFmAZLLeS7DNGKbxpYYxvuB8EISykEeMxJ+puhjvXAoniOl1hsf5Tj5/M/tkLYwmuKFGxUtVAp/fTaGeEsYnDQxF4E074CFHfip0mAVnaRSh8sSD3EFRCZu8AdmIudtynnHG5fwAX3o4XT7enMqPSBejw333xhNyw0xBNj6VEU0mSASa7gBsTGkb1yhR3GffJq7ujv2z8qk2mmU3bdYCFj0G0cKGwv7wU2+DCcmv0+H40zMnu8XHJeJx4fP17iNutHSsw==; s=purelymail2; d=lunabee.space; v=1; bh=8Y3lwlhVZfv4H/3/f/+71DSSH9NmrIzG73u+i2tfSKY=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=EQCNT6By20f/bsVJIAfAjVOA+AzEy04je5/X/dwgfRA9WPpcYeHk4ay7is119Ugt0ZiSJd4E/MHUunl/cdhYuuxr4Q3DLQSFYh7W7TFn7JCrYsumNJzm6RUZfsS0hM+AloatWo/W/xqQBoPubvedBOJ82zhCSzRhCutwx+JBKcsIlBiLzEJ0P5P9DWWqEe8VccVMr+TYER3m6puiFHGos1SEduTSwoPEivCH4SZegsLxttKboiXL1LIhS1CPZN9QhGRNk9Q9bVDwcFKXWlNPt74qhq0N3VqxgxE24gwQJ3LudLkRGztRO2z1GIOGll9nrF/u0bg7SDuG8N3M/BrOLA==; s=purelymail2; d=purelymail.com; v=1; bh=8Y3lwlhVZfv4H/3/f/+71DSSH9NmrIzG73u+i2tfSKY=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 69343@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -2124817350; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 03:15:39 +0000 (UTC) Date: Sat, 3 Aug 2024 22:13:30 -0500 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 f3d2a77625..75b02bff50 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -449,10 +449,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)) @@ -465,7 +465,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