From patchwork Wed Oct 30 14:30:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 69634 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 8109127BBEA; Wed, 30 Oct 2024 14:34:43 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 EC1A827BBE2 for ; Wed, 30 Oct 2024 14:34:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t69lz-0002EM-Hv; Wed, 30 Oct 2024 10:34:11 -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 1t69lx-0002Dn-Id for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:09 -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 1t69lw-0003eD-Rm; Wed, 30 Oct 2024 10:34:08 -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=eiCxsj0AaULcOIP4BeP7L25BgeYDXk8o756P+cDSI44=; b=GAojAcP8VTk9P8/pP78jGmo01CtetaKr/Ho5Um1vFiz/RhulyojxAsId8CNktnWFoSpj9s5MCrk77ZmVtjxxRQ3YKJplT//cgv5jnJXyuwVLAOWevucVenL8lTbzuVrT3WmtjWS6vC8HznW5xvdKGfZdTaIQdKvufC3ptTHStZrhGMjagfDYOge7f099TvdOGywlWetqoCn0Bxu77D/4clL+SHEFqDfyETdBIso1gFmdGZ/B5UCZmS1boA1Kbrp2OlOnx/qsOFvpVJiyCDN5cPLQTAZ/23IFrYKKXhkwT8rK2wNDNRXQqzVDjDmKsPyKWy8hHAi6RP+9RDxvWIKF6w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t69lw-0003zR-M8; Wed, 30 Oct 2024 10:34:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73927] [PATCH v4 12/18] installer: Use "partitioning-page" consistently. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, guix-patches@gnu.org Resent-Date: Wed, 30 Oct 2024 14:34:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73927@debbugs.gnu.org Cc: Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe X-Debbugs-Original-Xcc: Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe Received: via spool by 73927-submit@debbugs.gnu.org id=B73927.173029883615197 (code B ref 73927); Wed, 30 Oct 2024 14:34:08 +0000 Received: (at 73927) by debbugs.gnu.org; 30 Oct 2024 14:33:56 +0000 Received: from localhost ([127.0.0.1]:35344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69li-0003wx-Qz for submit@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69lN-0003v9-Ie for 73927@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t69jB-0003MP-Jo; Wed, 30 Oct 2024 10:31:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=eiCxsj0AaULcOIP4BeP7L25BgeYDXk8o756P+cDSI44=; b=MJbTQ95VENqmadfdtW6M j6CnAQkIzxbdf4OPc80B/IPZcUL6SWIf8qlj8qPQXh3bc2RXAqFEeaFCJCbm44qKj5s++VGPDlRHI GNnHyDeQSmjKUT4s7FO+9HsxIT2Wekui2loYeKG6rEC8SWWMyojNMj5BN7DVoc9OnqXmTPGsOjreV 1+DLxtE26C0EY7OM++xaYR0zKkvj2X/1atbTgw4T9YxE+0hnfamsj89nc/rSMvlmMY+flxP6GDXBZ sAjpdUNvoLY/C6yTNv3K25F1ZK7aLMnJFNVJIRKRQS49bsqF+QtPL6wp3f9w7m1tw2VPuqv/S/E8L sYKVFDwXpihLHA==; From: Janneke Nieuwenhuizen Date: Wed, 30 Oct 2024 15:30:41 +0100 Message-ID: <82b738b3f2e63aa7a312c03a249530f765132eef.1730296564.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 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: , 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 Having `partition-page' function call `RUN-partititionING-page' where all other proxy functions call `RUN-' hurts my brain while refactoring. * gnu/installer/record.scm ()[partition-page]: Rename to... [partitioning-page]: ...this. * gnu/installer/newt.scm (partitioning-page, newt-installer): Update accordingly. * gnu/installer.scm (installer-steps): Update accordingly. Change-Id: I6b2f3459a3d0a7a89260224b7d8438676e3411ba --- gnu/installer.scm | 3 ++- gnu/installer/newt.scm | 5 +++-- gnu/installer/record.scm | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 3dfcb7581a..3a05843cab 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019, 2020, 2022 Ludovic Courtès ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -312,7 +313,7 @@ (define (installer-steps) (id 'partition) (description (G_ "Partitioning")) (compute (lambda _ - ((installer-partition-page current-installer)))) + ((installer-partitioning-page current-installer)))) (configuration-formatter user-partitions->configuration)) (installer-step diff --git a/gnu/installer/newt.scm b/gnu/installer/newt.scm index e1c4453168..6d8ea35fff 100644 --- a/gnu/installer/newt.scm +++ b/gnu/installer/newt.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2020 Mathieu Othacehe +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -193,7 +194,7 @@ (define (hostname-page) (define (user-page) (run-user-page)) -(define (partition-page) +(define (partitioning-page) (run-partitioning-page)) (define (services-page) @@ -220,7 +221,7 @@ (define newt-installer (timezone-page timezone-page) (hostname-page hostname-page) (user-page user-page) - (partition-page partition-page) + (partitioning-page partitioning-page) (services-page services-page) (welcome-page welcome-page) (parameters-menu parameters-menu) diff --git a/gnu/installer/record.scm b/gnu/installer/record.scm index 5e0264682f..334af44a0c 100644 --- a/gnu/installer/record.scm +++ b/gnu/installer/record.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2020 Mathieu Othacehe ;;; Copyright © 2020 Florian Pelz +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,7 +38,7 @@ (define-module (gnu installer record) installer-timezone-page installer-hostname-page installer-user-page - installer-partition-page + installer-partitioning-page installer-services-page installer-welcome-page installer-parameters-menu @@ -86,7 +87,7 @@ (define-record-type* ;; procedure void -> void (user-page installer-user-page) ;; procedure void -> void - (partition-page installer-partition-page) + (partitioning-page installer-partitioning-page) ;; procedure void -> void (services-page installer-services-page) ;; procedure (logo #:pci-database) -> void