From 467a3c93db5341864bbe76b68c137ba140616b59 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Nov 2014 17:56:39 +0100 Subject: import: pypi: Gracefully handle non-existent packages. Fixes . Reported by Ian Denhardt . * guix/import/pypi.scm (url-fetch, json-fetch, pypi-fetch): Augment docstring to mention #f on failure. (pypi->guix-package): Likewise, and actually return #f on failure. * guix/scripts/import/pypi.scm (guix-import-pypi): Call 'leave' when 'pypi->guix-package' returns #f. --- guix/scripts/import/pypi.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'guix/scripts/import') diff --git a/guix/scripts/import/pypi.scm b/guix/scripts/import/pypi.scm index 0aaa23a158..a36065e5cf 100644 --- a/guix/scripts/import/pypi.scm +++ b/guix/scripts/import/pypi.scm @@ -80,4 +80,8 @@ Import and convert the PyPI package for PACKAGE-NAME.\n")) (reverse opts)))) (match args ((package-name) - (pypi->guix-package package-name))))) + (let ((sexp (pypi->guix-package package-name))) + (unless sexp + (leave (_ "failed to download meta-data for package '~a'~%") + package-name)) + sexp))))) -- cgit v1.2.3