From patchwork Sat Dec 21 17:04:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 35114 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 5041627BBEC; Sat, 21 Dec 2024 17:06:41 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 0F4F327BBEA for ; Sat, 21 Dec 2024 17:06:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tP2vX-0005RN-LX; Sat, 21 Dec 2024 12:06:07 -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 1tP2vU-0005Qj-Ng for guix-patches@gnu.org; Sat, 21 Dec 2024 12:06:04 -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 1tP2vU-0003P2-F0 for guix-patches@gnu.org; Sat, 21 Dec 2024 12:06:04 -0500 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=EREHFR3ipWhtTXlI/zC1e2OV5zlEkHLR82/AvIEdK+o=; b=Uuhez/xgawYwJkBTR+q1deeF6qyKiYW3lbOigOQox+u7enrXOtX+NwdN4KKeu0WzDuqHeg8LqZqV5NABdBDOTLTke1dFvi1biy+yzNAcKkspPlJ/tmPLvIyGCSPA8S59FrKSpJIs1KfPpyWG8OXuha3/4qFsLEuWtw+FFhG9wogS+owQrrghKb1Zu/EhuYH8RLriWsmjQGkeD9pidQkAorN2aCoFXXIdcVuZA7t15Nmx9Wp9sqZVs59DtMbkybd+IxmZV3DMUpmsHw4GoYHRAja7/g6yj5xzWJwURfEMYdS3JtxiCFpUmOR8g/6ravYZWQdoFiCS1y6T9ACzGGTOcg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tP2vU-0005RP-9q for guix-patches@gnu.org; Sat, 21 Dec 2024 12:06:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75010] [PATCH 4/7] Rename two remote variables confusingly named 'generations'. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Dec 2024 17:06:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75010 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75010@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 75010-submit@debbugs.gnu.org id=B75010.173480071520800 (code B ref 75010); Sat, 21 Dec 2024 17:06:04 +0000 Received: (at 75010) by debbugs.gnu.org; 21 Dec 2024 17:05:15 +0000 Received: from localhost ([127.0.0.1]:47521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tP2uh-0005PK-Bb for submit@debbugs.gnu.org; Sat, 21 Dec 2024 12:05:15 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:38121 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tP2ub-0005I2-Ab for 75010@debbugs.gnu.org; Sat, 21 Dec 2024 12:05:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1734800698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EREHFR3ipWhtTXlI/zC1e2OV5zlEkHLR82/AvIEdK+o=; b=fxJVef1q+g2bHak/MbVtqICsjyu2K7C/7Qvdf38euotmhZaUGw1SCB+hoQ0hF9eu9pctze UghAaXE+RnhCVkk1ix0nc3i/jPvHTWANPhcXvhEihzsC7d8EIqzdyjZo6nymEMeKW/i+ZD 30eti20X8uccUoCoNjlgN3QsVm9hLu9Hf35kkZS3uWNvhHD3JVlLKxqzot8rMFgcamFA8n Dwufqw2AQvM1gz3OR1BANgzKlJVDWDATLPlcYHXMmuu7QGAllqXFqIKxIODlLtdgeVI2FN 5ak944QK7GhQhXJgr3UO+fOYj08gZ30msSaoWIC8G3TwQ84h8cthrfASjMz+Bg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 6d2af424 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 21 Dec 2024 17:04:58 +0000 (UTC) Date: Sat, 21 Dec 2024 18:04:08 +0100 Message-ID: <9ae59065234a1d8215f94f2df13752cbfa438595.1734798943.git.herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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-parameters): 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 c76b51c757..3e69d4b9a3 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -455,10 +455,11 @@ (define (machine-boot-parameters 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 time serialized-params) (let* ((params (call-with-input-string serialized-params read-boot-parameters)) @@ -477,7 +478,7 @@ (define (machine-boot-parameters 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