From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gLpzGmYi5l7xNQAA0tVLHw (envelope-from ) for ; Sun, 14 Jun 2020 13:13:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wE1PFmYi5l4EDgAA1q6Kng (envelope-from ) for ; Sun, 14 Jun 2020 13:13:10 +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 825A9940669 for ; Sun, 14 Jun 2020 13:13:09 +0000 (UTC) Received: from localhost ([::1]:41904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkSRf-0000eA-1q for larch@yhetil.org; Sun, 14 Jun 2020 09:13:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkSRa-0000co-8D for guix-patches@gnu.org; Sun, 14 Jun 2020 09:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkSRZ-0000FJ-VA for guix-patches@gnu.org; Sun, 14 Jun 2020 09:13:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jkSRZ-0003iO-Pe for guix-patches@gnu.org; Sun, 14 Jun 2020 09:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41785] [PATCH v3 1/2] image: Make 'find-image' non-monadic. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Jun 2020 13:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41785 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 41785@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 41785-submit@debbugs.gnu.org id=B41785.159214034214228 (code B ref 41785); Sun, 14 Jun 2020 13:13:01 +0000 Received: (at 41785) by debbugs.gnu.org; 14 Jun 2020 13:12:22 +0000 Received: from localhost ([127.0.0.1]:43109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkSQw-0003hQ-6b for submit@debbugs.gnu.org; Sun, 14 Jun 2020 09:12:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkSQu-0003hB-KW for 41785@debbugs.gnu.org; Sun, 14 Jun 2020 09:12:21 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44617) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkSQp-00009Y-EG; Sun, 14 Jun 2020 09:12:15 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=47524 helo=dundal.peder.onsbrabantnet.nl) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jkSQo-0003hz-GF; Sun, 14 Jun 2020 09:12:14 -0400 From: Jan Nieuwenhuizen Organization: AvatarAcademy.nl References: <20200610085441.890-1-janneke@gnu.org> <20200612214214.14112-1-janneke@gnu.org> <87r1ujjkst.fsf@gnu.org> <878sgrazg8.fsf@gnu.org> <87imftkel5.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 14 Jun 2020 15:12:11 +0200 In-Reply-To: <87imftkel5.fsf@gnu.org> (Mathieu Othacehe's message of "Sun, 14 Jun 2020 14:37:58 +0200") Message-ID: <87tuzdeqqc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (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=none; 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: 0.49 X-TUID: /6ozgN607Ivn Mathieu Othacehe writes: Hi Mathieu, >>>> + ((image -> (find-image file-system-type (%current-target-syste= m))) >>>> (sys (system-derivation-for-action os image action >>>> #:file-system-type fi= le-system-type >>>> #:image-size image-si= ze >>> >>> Same here, otherwise this look good to me. > > I missed something, "target" variable is shadowing the "target" > argument. The attached patch should fix the issue, I'm testing it. Oops! > From 760e46d2ff57fab2b67656b85d800572bbc56f4b Mon Sep 17 00:00:00 2001 > From: Mathieu Othacehe > Date: Sun, 14 Jun 2020 14:16:37 +0200 > Subject: [PATCH] scripts: system: Fix "init" command. > > This is a follow-up of 7ca533c7237622d70b423033c4506217d9ce4014. The > introduced "target" variable is shadowing the target argument. > > * guix/scripts/system.scm (perform-action): Rename "target" variable to > "target*". > --- > guix/scripts/system.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm > index 6769a602b1..212b49f008 100644 > --- a/guix/scripts/system.scm > +++ b/guix/scripts/system.scm > @@ -802,8 +802,8 @@ static checks." > (check-initrd-modules os))) >=20=20 > (mlet* %store-monad > - ((target (current-target-system)) > - (image -> (find-image file-system-type target)) > + ((target* (current-target-system)) > + (image -> (find-image file-system-type target*)) > (sys (system-derivation-for-action os image action > #:file-system-type file-= system-type > #:image-size image-size Yeah, that looks right! I didn't notice either. I could have been more careful/suspicious, as in the other, similar case in gnu/tests/install.scm I moved (target (operating-system-derivation target-os)) down to have mlet* do the shadowing properly. Janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com