From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cCPxFp337Gbp4wAAqHPOHw:P1 (envelope-from ) for ; Fri, 20 Sep 2024 04:18:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id cCPxFp337Gbp4wAAqHPOHw (envelope-from ) for ; Fri, 20 Sep 2024 06:18:37 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TzcuADFM; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail3 header.b=bjjMk8lD; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail3 header.b=G3Pt1eEH; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1726805917; 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-type:content-type: 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=80icGfl2or1lrriWwrT/nYDSX0I4T4OlYt4mLJtIZf0=; b=V7KfRankBrIPc8L5WtLFwGSIvSY0VpOWwecME6jW+fmUta4ut93hgxLcehgk4/aQjcLWo2 hdQhuAsoclpwYAPv3F1TTConXHsyZm8mY86/Y9xb6BBYbw4jMDfqoxXZkWCceZ1apwwVAB 53Yzm6yxW60chS3/n/5gtgXQ4ySPKjmqzuQgDPHPzpf+lf+xz43Grslj+i/yBDPM1oxH3F 8tB/AthaOTKJvhYxn90g+13ldmmpEQ9QkR3h1rO0gyObiwEgChaQ5eDsfIm9X8+UBu/Ok0 EwLIPQYxgET1sx3YwjAahhyQRdeaa96I6RgOfUkyVJpOgG9ZKWMDKPeNhSKxZQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1726805917; a=rsa-sha256; cv=none; b=Xl5Qsw6kD0DX837/OZ3/Vfps8INYjNM6h1P9x54pSIUnSLs5LATTeljRen4VWg77xRklUo vDsZa3asxALSware5ox3n5nJpUHYraBwqNcI7yb4fwFxbYsCv7yhzZfGnME8wf5jExibWn a/hApvcgoakGEOIZ5qElJYINlgyyg6VSNTEjrs2kHiaDvJZ6a9yU66TmIRWvT5ZaznGqVh hjUUJRWsUwTjxkDacyibNz07rS6sp6yGch/cVNBQJF1NEUBqD7UmWeotmez2GFmkf9HWvK whmaP80/hKBXsx5BErrK6VP6yWI0vzWYZA2Gqxs7DSGvIFRH1HHNVTITq9Mv1Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TzcuADFM; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail3 header.b=bjjMk8lD; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail3 header.b=G3Pt1eEH; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 4B96373B97 for ; Fri, 20 Sep 2024 06:18:37 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srV5k-0008Gc-Vo; Fri, 20 Sep 2024 00:18: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 1srV5Y-0008BP-II for guix-patches@gnu.org; Fri, 20 Sep 2024 00:17:49 -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 1srV5Y-0006Fx-8w for guix-patches@gnu.org; Fri, 20 Sep 2024 00:17:48 -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=80icGfl2or1lrriWwrT/nYDSX0I4T4OlYt4mLJtIZf0=; b=TzcuADFMizGiY0jV9ZX8FXq78h/fltsculty2S7VRP6C55zQbhDoRJWIj/+dRizN+mhEZAvKztxSPKO03H5RPs+dMeAVXD7Ee+Gelac9paFh+1ithRzUymnZaNIQwia1AgrvSISYRY+B+rMj6yvWFXL/+puZEOdpIqMFgvkT86j8Nd7eJP4w0m+kK6s4iynmQal0dccz+MttWE0fxamXb4E5hI5o6XtXf8r6MEBhIiry53EzIDh4EBukf+/isBj+gDYB005M053Gzc8ntquw/qKTsuLDd8OdE83JRaQZp7ouZzN+1hZkMswbDjb1m9hvCIqzTkOw8IvUUAdAoXzWNQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1srV5q-0005UT-ET for guix-patches@gnu.org; Fri, 20 Sep 2024 00:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v4 07/11] Rename two remote variables confusingly named 'generations'. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Sep 2024 04:18: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: Herman Rimm , Felix Lechner Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.172680587820981 (code B ref 69343); Fri, 20 Sep 2024 04:18:06 +0000 Received: (at 69343) by debbugs.gnu.org; 20 Sep 2024 04:17:58 +0000 Received: from localhost ([127.0.0.1]:33759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srV5h-0005SJ-Jl for submit@debbugs.gnu.org; Fri, 20 Sep 2024 00:17:57 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:52036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srV5e-0005Rh-Uj for 69343@debbugs.gnu.org; Fri, 20 Sep 2024 00:17:55 -0400 DKIM-Signature: a=rsa-sha256; b=bjjMk8lD0P/x7H/CdQBpYAgNqU/XI8b08yQkmm6cGaqNDmPS0w5RmpefFS/DEbGT4C/rLBQj8sO3J5yyXLIUO44jul0daosFhNHFotasRtIkRsEI91OAdx3nyPryxwK8GU254Uk5RRR3fo8bEq9g/st38ytnAaq/9c2SZrwIvC+uWJCUK1boeGgNDa96AvxXsgID2P9JI9C34g3kss75XHRabqI2TWJvWPgsBaK8CHAZZdgz39UU4M37W01k+vYkXNZ8wC62cWxRZuFz0lD1lpLxxI7fH3Rp5GXpgs0io/A9ivdi069OnJNUhhdoTqyAq8X5EIeAGFqRXWBvmuYXrA==; s=purelymail3; d=lunabee.space; v=1; bh=zyS70lqfQXnJ0l6hxl0r9f5BP9QpTTTkEhs2PRCAb+I=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=G3Pt1eEHDWK4/MTy1sQECvKa5CXCtyfy2ssJ9BkKPWejQg12V/8TIOCfhDvKwxoLlc6L+L1W3WcXLVsoIlev1Zrfm4PVnBx9FsMn3+RRCVwfULsBhMUgv4JcFYd/M2NFHfmkuXqcTFHxEZqRA47QeLMC9zJGwpTotc3AuHoiu3X0slOc9yK344dyFkdEGOpOjVAfPoKxocXEBasxBBfD52wV+m8dP6csNWlU9+Xfk5C7vwyzTlXVpVaA0YN8mMdiqzZ2bu9CqfzjAhnq/hkv0fpuK9+j0BeAISa5gC7BBEBajaPQo37IUOsgSgowwkY0DGqWQx5+wki0sZd0T0v/kw==; s=purelymail3; d=purelymail.com; v=1; bh=zyS70lqfQXnJ0l6hxl0r9f5BP9QpTTTkEhs2PRCAb+I=; 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 -100958845; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Fri, 20 Sep 2024 04:17:17 +0000 (UTC) Date: Thu, 19 Sep 2024 23:16:01 -0500 Message-ID: <849f65d3453b94dcef8c572a8486196695d865bb.1726805765.git.lilah@lunabee.space> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Content-Type: text/plain; charset=UTF-8 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: , From: Lilah Tascheter via Guix-patches Reply-To: Lilah Tascheter 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: -4.91 X-Spam-Score: -4.91 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Queue-Id: 4B96373B97 X-TUID: hp6Qg8I/zedL From: Felix Lechner Both refer to data sets returned from the remote expression, and one of the= m shadowed an element of itself. * gnu/machine/ssh.scm (machine->boot-alternatives): 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 f3d2a77625..a96ca68f47 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -449,10 +449,11 @@ (define (machine->boot-alternatives machine) (read-file boot-parameters-path)))) (reverse (generation-numbers %system-profile))))))) =20 - (mlet* %store-monad ((generations (machine-remote-eval machine remote-ex= p))) + (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 +466,7 @@ (define (machine->boot-alternatives machine) (kernel-arguments (append (bootable-kernel-arguments system-path root ver= sion) (boot-parameters-kernel-arguments params)))))))= ) - generations)))) + remote-results)))) =20 (define-syntax-rule (with-roll-back should-roll-back? mbody ...) "Catch exceptions that arise when binding MBODY, a monadic expression in --=20 2.45.2