From patchwork Fri Mar 8 08:12:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 61512 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 3683227BBEA; Fri, 8 Mar 2024 08:26:05 +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 B451727BBE2 for ; Fri, 8 Mar 2024 08:26:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riVY0-0003zR-Ue; Fri, 08 Mar 2024 03:25:44 -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 1riVXt-0003vY-U5 for guix-patches@gnu.org; Fri, 08 Mar 2024 03:25:39 -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 1riVXr-00018i-Kb for guix-patches@gnu.org; Fri, 08 Mar 2024 03:25:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riVYM-0002f0-Gq for guix-patches@gnu.org; Fri, 08 Mar 2024 03:26:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v2 09/12] Give a separate name to a commonly used expression. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 08:26: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.170988635610079 (code B ref 69343); Fri, 08 Mar 2024 08:26:06 +0000 Received: (at 69343) by debbugs.gnu.org; 8 Mar 2024 08:25:56 +0000 Received: from localhost ([127.0.0.1]:56422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVYC-0002cU-5h for submit@debbugs.gnu.org; Fri, 08 Mar 2024 03:25:56 -0500 Received: from sendmail.purelymail.com ([34.202.193.197]:44466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVY5-0002bK-Uu for 69343@debbugs.gnu.org; Fri, 08 Mar 2024 03:25:51 -0500 DKIM-Signature: a=rsa-sha256; b=NMoVXHLnPS5hREIX+sKQ34tJ6EqWG+rKKlzj19qlGfUrezUatkBQTte+APW6agaWqaapP7btPZEvi149KZNwSZVjjMaR1BPwSFyVwLBtrqE4nl6WYd+9/e53W59TVrdNr3qeaYOUl0fM5CNwcqxC9j4m9hIO1yA70DCdlrRe8Ik9jiaYNFS11M0UmhUvOgpaOBwFznpJAHOdwXR0ubaF47wCEdIV1kTvxRTM9dOm0+J9i7XXf/vxRCCme/cVWnC4Xaq1pDTwPPfgxdtWnMWHKXq/BDHTAMSPVGJfIJBUB/mzgI+Dgt7nJD8nRewSpopIQqR8wuazZZ6Dkn6LPXKoIQ==; s=purelymail2; d=lunabee.space; v=1; bh=44udMxD4fW29ObvpvJVxkvSnP+DqxG0lHbpJHjb3WRc=; h=Received:From:To:Subject; DKIM-Signature: a=rsa-sha256; b=yPOZ4PL1K5T8ZSnLTFEXZUgis383kRkzgBM1LnPYndh4KfbKklaKokZF7Tma1/OAjaSmvO24lhQ0B1gcEZ3Kd+DYQfvNKzJYN7DqC0li13+kQFnzA2aLHov1rije1Gf9rY8dIImAzUwkR4Wdk6lVdrtfWizcjuo3v98rAZkYxuc6L66z62LKawLvuUWsIdGWruvFdUB5N8WjN9YT39ElhNHWlyHMxGViiCZLl2FNJQH2LLvETkQkMx6AJxyKMDwZ/A3aCOudpu7JwxM1lg+fz/K4LnuI7Cx0b8WCqBnK6ug5NQYoB8m3xK0q6pTRL3TEVY1pAMDzbTnXdffcSNSGZg==; s=purelymail2; d=purelymail.com; v=1; bh=44udMxD4fW29ObvpvJVxkvSnP+DqxG0lHbpJHjb3WRc=; 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:05 -0600 Message-ID: <6b8cc8a8b8b13d0c06ffba22585a485bb96fd562.1709885528.git.lilah@lunabee.space> 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 * gnu/machine/ssh.scm (roll-back-managed-host): Factor out a subexpression into new variable parameters. Change-Id: I8d70684142bea736042d6c9dc8276ea7bdb9c181 --- gnu/machine/ssh.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 9adb5e79b9..45ab8b9868 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -584,14 +584,11 @@ (define (roll-back-managed-host machine) (mlet* %store-monad ((boot-alternatives (machine->boot-alternatives machine)) (_ -> (if (< (length boot-alternatives) 2) (raise roll-back-failure))) - (entries -> (map boot-parameters->menu-entry - (list (second boot-alternatives)))) - (locale -> (boot-parameters-locale - (second boot-alternatives))) - (crypto-dev -> (boot-parameters-store-crypto-devices - (second boot-alternatives))) - (store-dir -> (boot-parameters-store-directory-prefix - (second boot-alternatives))) + (parameters (second boot-alternatives)) + (entries -> (list (boot-parameters->menu-entry parameters))) + (locale -> (boot-parameters-locale parameters)) + (crypto-dev -> (boot-parameters-store-crypto-devices parameters)) + (store-dir -> (boot-parameters-store-directory-prefix parameters)) (old-entries -> (map boot-parameters->menu-entry (drop boot-alternatives 2))) (bootloader -> (operating-system-bootloader