[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41785] [PATCH v3 1/2] image: Make 'find-image' non-monadic.
From: |
Mathieu Othacehe |
Subject: |
[bug#41785] [PATCH v3 1/2] image: Make 'find-image' non-monadic. |
Date: |
Sun, 14 Jun 2020 14:37:58 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Hey!
>>> + ((image -> (find-image file-system-type (%current-target-system)))
>>> (sys (system-derivation-for-action os image action
>>> #:file-system-type
>>> file-system-type
>>> #:image-size image-size
>>
>> 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.
Thanks,
Mathieu
>From 760e46d2ff57fab2b67656b85d800572bbc56f4b Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <othacehe@gnu.org>
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)))
(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
--
2.26.2