unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: zimoun <zimon.toutoune@gmail.com>
To: 45983@debbugs.gnu.org
Subject: [bug#45983] [PATCH 3/3] scripts: import: json: Fix error handling.
Date: Tue, 19 Jan 2021 16:27:37 +0100	[thread overview]
Message-ID: <20210119152737.4344-3-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20210119152737.4344-1-zimon.toutoune@gmail.com>

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

* guix/scripts/import/json.scm (guix-import-json): Handle error.
---
 guix/scripts/import/json.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/import/json.scm b/guix/scripts/import/json.scm
index 778e5f4bc5..63fba260ae 100644
--- a/guix/scripts/import/json.scm
+++ b/guix/scripts/import/json.scm
@@ -1,6 +1,7 @@
 ;;; 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,10 @@ Import and convert the JSON package definition in PACKAGE-FILE.\n"))
                            (reverse opts))))
     (match args
       ((file-name)
-       (or (json->code file-name)
-           (leave (G_ "invalid JSON in file '~a'~%") file-name)))
+       (if (file-exists? file-name)
+         (or (json->code file-name)
+             (leave (G_ "invalid JSON in file '~a'~%") file-name))
+         (leave (G_ "invalid file name~%"))))
       (()
        (leave (G_ "too few arguments~%")))
       ((many ...)
-- 
2.29.2





  parent reply	other threads:[~2021-01-19 15:35 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-19 15:25 [bug#45983] [PATCH 0/3] Fix non-recursive importers gnu and json zimoun
2021-01-19 15:27 ` [bug#45983] [PATCH 1/3] import: gnu: Add internationalized messages zimoun
2021-01-19 15:27   ` [bug#45983] [PATCH 2/3] guix: gnu-maintenance: Fix error handling zimoun
2021-01-19 15:27   ` zimoun [this message]
2021-01-26 22:17     ` [bug#45983] [PATCH 0/3] Fix non-recursive importers gnu and json Ludovic Courtès
2021-01-26 22:14   ` Ludovic Courtès
2021-01-27 23:46 ` [bug#45983] [PATCH v2 1/3] guix: gnu-maintenance: Fix error handling zimoun
2021-01-27 23:46   ` [bug#45983] [PATCH v2 2/3] import: gnu: Add internationalized messages zimoun
2021-01-31 20:37     ` bug#45983: [PATCH 0/3] Fix non-recursive importers gnu and json Ludovic Courtès
2021-01-27 23:46   ` [bug#45983] [PATCH v2 3/3] scripts: import: json: Fix error handling zimoun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210119152737.4344-3-zimon.toutoune@gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=45983@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).