From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2KfUGRnQbF8wWQAA0tVLHw (envelope-from ) for ; Thu, 24 Sep 2020 16:58:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wG2jFRnQbF83MgAAB5/wlQ (envelope-from ) for ; Thu, 24 Sep 2020 16:58:01 +0000 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 63AFD9400C7 for ; Thu, 24 Sep 2020 16:58:00 +0000 (UTC) Received: from localhost ([::1]:35236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLU8V-0008I1-40 for larch@yhetil.org; Thu, 24 Sep 2020 12:30:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLTKo-0008Rj-KC for guix-patches@gnu.org; Thu, 24 Sep 2020 11:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLTKn-0007OC-Rk for guix-patches@gnu.org; Thu, 24 Sep 2020 11:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLTKn-0008By-Pp for guix-patches@gnu.org; Thu, 24 Sep 2020 11:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42634] [PATCH 2/3] system: image: Add image-type support. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 15:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42634 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: Mathieu Othacehe , 42634@debbugs.gnu.org Received: via spool by 42634-submit@debbugs.gnu.org id=B42634.160096188831424 (code B ref 42634); Thu, 24 Sep 2020 15:39:01 +0000 Received: (at 42634) by debbugs.gnu.org; 24 Sep 2020 15:38:08 +0000 Received: from localhost ([127.0.0.1]:41378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLTJv-0008Am-Nq for submit@debbugs.gnu.org; Thu, 24 Sep 2020 11:38:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLTJt-0008AC-Rr for 42634@debbugs.gnu.org; Thu, 24 Sep 2020 11:38:06 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35065) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLTJn-0007FP-7M; Thu, 24 Sep 2020 11:38:00 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57564 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kLTJj-00005e-2e; Thu, 24 Sep 2020 11:37:56 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200731144929.703345-1-othacehe@gnu.org> <20200731144929.703345-2-othacehe@gnu.org> Date: Thu, 24 Sep 2020 17:37:53 +0200 In-Reply-To: <20200731144929.703345-2-othacehe@gnu.org> (Mathieu Othacehe's message of "Fri, 31 Jul 2020 16:49:28 +0200") Message-ID: <878scz6v8u.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: IyE4R7ozO2cL Mathieu Othacehe skribis: > * gnu/system/image.scm (image-with-os): New macro. Rename the old > "image-with-os" procedure to ... > (image-with-os*): ... this new procedure, > (system-image): adapt according, > (raw-image-type, iso-image-type, uncompressed-iso-image-type > %image-types): new variables, > (lookup-image-type-by-name): new procedure. > (find-image): remove it. > * gnu/system/images/hurd.scm (hurd-image-type): New variable, > use it to define ... > (hurd-disk-image): ... this variable, using "os->image" procedure. > * gnu/tests/install.scm (run-install): Rename > installation-disk-image-file-system-type parameter to installation-image-= type, > use os->config instead of find-image to compute the image passed to syste= m-image, > (%test-iso-image-installer) adapt accordingly, > (guided-installation-test): ditto. [...] > +(define (lookup-image-type-by-name name) > + "Return the image type called NAME." > + (or (srfi-1:find (lambda (image-type) > + (string=3D? name (image-type-name image-type))) > + (force %image-types)) > + (leave (G_ "~a: no such image type.~%") name))) I=E2=80=99d raise a =E2=80=98&formatted-message=E2=80=99 condition instead.= That allows you to remove (guix ui) from the loop. You can also remove the period from the message here sine it=E2=80=99s not a sentence. Otherwise LGTM! Ludo=E2=80=99.