From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id eI43HLtN2WVHHQAA62LTzQ:P1 (envelope-from ) for ; Sat, 24 Feb 2024 03:00:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id eI43HLtN2WVHHQAA62LTzQ (envelope-from ) for ; Sat, 24 Feb 2024 03:00:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=g5t++sRc; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708740027; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=CSsswN8BTX2Yths+sQrA4zb4wg9oBitLuzyWvf4KwOw=; b=AxtVoYerIdqUaShhMT2NDvJmQTiS1Og/oSYYDKTGRu8b1Jq0rQwKfrjIBUsuaHR5HQX9xz +2QY6LfBUcWklwRlGEZgcQ0kI9FABpJMAg+NPOOW4DaxuEK2IKnGvBtf4jFeDkcvt0w0kj taqa5EcSAosFLywHz168nGdnaZ42hSFuG2Us9A9PKU28GLtOomV8QAPjKuL51+KI9d3D9s QlwuVMW7y2dYn+RPov0ZILWkpiHSZeQwbbuIQYPkJtaPGSrpRU6RkXXhkVJiKIFqGvs4Wc e0Qh1GAjFGBe/UCn8zLNvap4TSwcnuoDgTvtzi89EkMmIodY1zHsxnv5YsdDcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=g5t++sRc; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708740027; a=rsa-sha256; cv=none; b=VUuMPHTumuVIxP+DOOiNXlaOssBWv1IvH4wKri86WcpmZ8rqpKdlZeBTtnqi6SuFQOEv4b aJctH0j+p/wAIFJ0XRihBDNggCKr3PMHTaSmxxWzZ07Lmb7DG+S/uu/o0ImBedsXHEn9q7 IAepjDIb4orj/l8oocL4QWgzy8UKDyySi4VKh9T6Acj8QTzPTtApZgU3CDqVDmJ0OvJeoU aIubnpWz4LQrtcXGEClmbnh2/J0rmRSsDAyuYpE0zN/O32Yuhj2DjZlAO7K++9m3nW5AZJ MJVg3BRqwo+OxC8Cr91JjMCy2q1wBLrDbl0pk7KtW8jXv6UnsxRGgvZ9/MYDEw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 608FF3ACAC for ; Sat, 24 Feb 2024 03:00:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdhKR-0004Ty-LH; Fri, 23 Feb 2024 20:59:51 -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 1rdhKJ-0004Qb-Qr for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:45 -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 1rdhKH-0006l4-TX for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdhKf-0003eT-Jm for guix-patches@gnu.org; Fri, 23 Feb 2024 21:00:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH 08/12] Rename two remote variables confusingly named 'generations'. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 02:00:05 +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.170873995413798 (code B ref 69343); Sat, 24 Feb 2024 02:00:05 +0000 Received: (at 69343) by debbugs.gnu.org; 24 Feb 2024 01:59:14 +0000 Received: from localhost ([127.0.0.1]:36545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJq-0003aO-2S for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:14 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:37576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJk-0003YB-IY for 69343@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=G1N8ZklrS4vkAgg +RWhHzTmtfzYctpiC2LGdDiRx8Bc=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=g5t++sRcDu+6TfrUDPVE5Qzep6Heul/GCLOQ5E5J FLcQe7QjK2Ft12fnffMyItvtQuPLd0tW/hwaZDUUWAC07kPqUYxti1xXwokLWH2V58X7zL qbxav2izw6tiKmsHt8dPtiqsUxmw6q3nQnilzRMVWODWrAit3ed6mE/azWv2w= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id b3877c26 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 24 Feb 2024 01:51:56 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e65090a7; Sat, 24 Feb 2024 01:51:56 +0000 (UTC) Date: Fri, 23 Feb 2024 17:51:41 -0800 Message-ID: <4fc8cce4e11bad8521b4afb93642de7c872d2d63.1708736440.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches From: Felix Lechner via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.27 X-Spam-Score: -6.27 X-Migadu-Queue-Id: 608FF3ACAC X-Migadu-Scanner: mx11.migadu.com X-TUID: HWQscyXfOgHI Both refer to data sets returned from the remote expression, and one of them shadowed an element of itself. 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 -- 2.41.0