summaryrefslogtreecommitdiff
path: root/guix/scripts
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-04-15 00:38:15 +0200
committerRicardo Wurmus <rekado@elephly.net>2020-04-16 23:41:52 +0200
commitc89343232065c50d196cd194073d2034eaedaf44 (patch)
tree6b297fa17b50ab8cc4548a8ebb2bb7662923dd98 /guix/scripts
parent4f353c485dea4b549a0aabd1c87b0dd03fef4f1e (diff)
import/json: Use json->code.
* guix/import/json.scm (json->code): Export procedure. * guix/scripts/import/json.scm (guix-import-json): Use json->code.
Diffstat (limited to 'guix/scripts')
-rw-r--r--guix/scripts/import/json.scm12
1 files changed, 3 insertions, 9 deletions
diff --git a/guix/scripts/import/json.scm b/guix/scripts/import/json.scm
index c9daf65479..778e5f4bc5 100644
--- a/guix/scripts/import/json.scm
+++ b/guix/scripts/import/json.scm
@@ -23,7 +23,7 @@
#:use-module (guix utils)
#:use-module (guix scripts)
#:use-module (guix import utils)
- #:use-module (guix import print)
+ #:use-module (guix import json)
#:use-module (guix scripts import)
#:use-module (guix packages)
#:use-module (srfi srfi-1)
@@ -88,14 +88,8 @@ Import and convert the JSON package definition in PACKAGE-FILE.\n"))
(reverse opts))))
(match args
((file-name)
- (catch 'json-invalid
- (lambda ()
- (let ((json (json-string->scm
- (with-input-from-file file-name read-string))))
- ;; TODO: also print define-module boilerplate
- (package->code (alist->package json))))
- (lambda _
- (leave (G_ "invalid JSON in file '~a'~%") file-name))))
+ (or (json->code file-name)
+ (leave (G_ "invalid JSON in file '~a'~%") file-name)))
(()
(leave (G_ "too few arguments~%")))
((many ...)