Skip to content
Snippets Groups Projects
Unverified Commit 60947257 authored by zimoun's avatar zimoun Committed by Ludovic Courtès
Browse files

scripts: import: json: Fix error handling.

Fixes partially <https://bugs.gnu.org/44115

>.

* guix/scripts/import/json.scm (guix-import-json): Handle error.

Signed-off-by: default avatarLudovic Courtès <ludo@gnu.org>
parent 460e7d8b
No related branches found
No related tags found
No related merge requests found
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
......@@ -88,8 +89,13 @@ (define (parse-options)
(reverse opts))))
(match args
((file-name)
(or (json->code file-name)
(leave (G_ "invalid JSON in file '~a'~%") file-name)))
(catch 'system-error
(lambda ()
(or (json->code file-name)
(leave (G_ "invalid JSON in file '~a'~%") file-name)))
(lambda args
(leave (G_ "failed to access '~a': ~a~%")
file-name (strerror (system-error-errno args))))))
(()
(leave (G_ "too few arguments~%")))
((many ...)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment