From patchwork Sun Aug 4 03:13:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 66641 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 C5EED27BBEA; Sun, 4 Aug 2024 04:17:26 +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 487C727BBE2 for ; Sun, 4 Aug 2024 04:17:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saRjw-0003mL-6x; Sat, 03 Aug 2024 23:17:00 -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 1saRjj-0003kO-1X 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-0002Qd-OI 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=C1+PJ+OdJrDOMqoOuxR7drYS7s9EdXbDe6sodPYZ/MQ=; b=W+KC0sC3wSpy8bUNaAMKZ264D5c2VoxmN48owBDO9UFGacGSph3SL3Jy7cYBuUwB8bXroUUGAyNyhIsHOr73daCv7+uSZ/p94LEkk8Wm0w29nDubUq7ZPvE9lcnn5lXPrfYoSx3G+MaBrTnfryvVrJjaCuqpm0up3lxNO2wsly2+lMnj5uT8k0PPxsj446YuHNSDolb3XuHTHptnTFrOEtiICl2j5xb85ESNOVUOfQ2lk+u5XlvnON3rG5ZpYfJSHInl4fOAuANq+xEcmFHPxJ10yFpWSYWul2w52Fqe060/TYgVXO14o7Jnn4cfrV4JWMc35fBevxrGwTWrmKwytQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1saRk3-0007oX-6U for guix-patches@gnu.org; Sat, 03 Aug 2024 23:17:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH v3 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: Sun, 04 Aug 2024 03:17:07 +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.172274140729845 (code B ref 69343); Sun, 04 Aug 2024 03:17:07 +0000 Received: (at 69343) by debbugs.gnu.org; 4 Aug 2024 03:16:47 +0000 Received: from localhost ([127.0.0.1]:55022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRjj-0007lJ-5J for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:16:47 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:51922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saRjh-0007kZ-J3 for 69343@debbugs.gnu.org; Sat, 03 Aug 2024 23:16:45 -0400 DKIM-Signature: a=rsa-sha256; b=I9T/4sY9fz149ShK0VpLjWmYSXmSHSY/h39zdB7icindQY7D6o87ZPE+M9G820dwZMuEiX2su0D6ZNHWzQu6c7WiooUHrjtlg4zbQ5EmfUymJVs8OjAnpFeuYw5GGkgagFvG+y89pbm+Mjf3vZBfhRy1XIoT4VS5Ul6b0sORmItbvecXfA2Ngh+txZ2i7P7rvlO9+DIHT5jmoGtHbkwHSe0f1AqQrP62zjxqJN7Ee2/FmZVU3oj2P+5tBnwiE4gWP/kIvKvGp1DVcjJ30MLuc/HY09ycCAJxBXpD1gYpWafha4eNfDkdcfx5/UE+s8K70qLAwPEbl4PHB/nw7ozB+Q==; s=purelymail2; d=lunabee.space; v=1; bh=4MuWm+0iaQXUgxclHAHItfhlMj6cT4OP/EafMQjnn+g=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=P+yYzydrET0+G3PEukGwnKJ6M2gzXPhQE712nELbHwpVHzOWd3Dmicwm3Fu++zBzy9Rs4bOx3FUiLCk5dNBo80tcarW7mzpC7cRnJzelAme/zH9h5y+jkZi3zMHi1O2cP4NnXoMh0F0tEB0yrseYne17Cki5ZDefzMXOsfJe3oIX15l99m6erjig49LIv2ZTARKc4ggIldmGodwrrmMu73QQONvWBKucPfWczBieq1vo4TTDL0WSP8udodk2Vy6L1A6fPaPEUrIpDcngnc1ZRS67uJpN7XmZUCFGTg6VZDera3qLgDATRPKDPs6kXNk7zBP6lcxGZ3enH/+NR+m+1A==; s=purelymail2; d=purelymail.com; v=1; bh=4MuWm+0iaQXUgxclHAHItfhlMj6cT4OP/EafMQjnn+g=; 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:40 +0000 (UTC) Date: Sat, 3 Aug 2024 22:13:31 -0500 Message-ID: <907087c7d2f0161e1c7800430c6017d2b4b92b9a.1722741214.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 75b02bff50..fa1066b27b 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -582,14 +582,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