01/07: image: Error out when passed an unsupported partition type.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 61d9c4458eef35a2a3fce94f113031d86b9f4d8d
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Nov 5 14:56:16 2020 +0100

    image: Error out when passed an unsupported partition type.
    
    * gnu/build/image.scm (make-partition-image): Use 'raise' instead of
    'format' when TYPE is not supported.
    (convert-disk-image): Remove unneeded 'begin'.
---
 gnu/build/image.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 8a2d0eb..640a784 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -118,16 +118,16 @@ ROOT directory to populate the image."
      ((string=? type "vfat")
       (make-vfat-image partition target root))
      (else
-      (format (current-error-port)
-              "Unsupported partition type~%.")))))
+      (raise (condition
+              (&message
+               (message "unsupported partition type"))))))))
 
 (define (convert-disk-image image format output)
   "Convert IMAGE to OUTPUT according to the given FORMAT."
   (case format
     ((compressed-qcow2)
-     (begin
-       (invoke "qemu-img" "convert" "-c" "-f" "raw"
-               "-O" "qcow2" image output)))
+     (invoke "qemu-img" "convert" "-c" "-f" "raw"
+             "-O" "qcow2" image output))
     (else
      (copy-file image output))))