branch master updated: image: Remove 'maybe-with-target'.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 4a04d49  image: Remove 'maybe-with-target'.
4a04d49 is described below

commit 4a04d49c2e8aa52b0e6051c6868c8892d017e61b
Author: Mathieu Othacehe <m.othacehe@gmail.com>
AuthorDate: Sat Jun 13 16:55:12 2020 +0200

    image: Remove 'maybe-with-target'.
    
    * gnu/system/image.scm (maybe-with-target): Remove,
    (system-image): adapt accordingly.
---
 gnu/system/image.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 97e4bb0..1bda25f 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -520,14 +520,6 @@ it can be used for bootloading."
                             (type root-file-system-type))
                           file-systems-to-keep)))))
 
-(define-syntax-rule (maybe-with-target image exp ...)
-  (let ((target (image-target image)))
-    (if target
-        (with-parameters ((%current-target-system target))
-          exp ...)
-        (begin
-          exp ...))))
-
 (define* (system-image image)
   "Return the derivation of IMAGE.  It can be a raw disk-image or an ISO9660
 image, depending on IMAGE format."
@@ -535,11 +527,12 @@ image, depending on IMAGE format."
 
   (let* ((os (operating-system-for-image image))
          (image* (image-with-os image os))
+         (target (image-target image))
          (register-closures? (has-guix-service-type? os))
          (bootcfg (operating-system-bootcfg os))
          (bootloader (bootloader-configuration-bootloader
                       (operating-system-bootloader os))))
-    (maybe-with-target image
+    (with-parameters ((%current-target-system target))
       (case (image-format image)
         ((disk-image)
          (system-disk-image image*