From 482b8ae2cd3f126a1300178e317df8993bf75b16 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 12 Dec 2020 00:06:18 +0100 Subject: import/cran: Abort with error message when recursive import fails. Previously, after a failed recursive import "guix import" would signal success. * guix/import/cran.scm (cran->guix-package): Raise a condition when all repositories have been exhausted. * guix/scripts/import/cran.scm (guix-import-cran): Handle errors. --- guix/scripts/import/cran.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'guix/scripts/import/cran.scm') diff --git a/guix/scripts/import/cran.scm b/guix/scripts/import/cran.scm index 33944c4a3f..20e82ae2ca 100644 --- a/guix/scripts/import/cran.scm +++ b/guix/scripts/import/cran.scm @@ -97,10 +97,11 @@ Import and convert the CRAN package for PACKAGE-NAME.\n")) ((package-name) (if (assoc-ref opts 'recursive) ;; Recursive import - (map package->definition - (filter identity - (cran-recursive-import package-name - #:repo (or (assoc-ref opts 'repo) 'cran)))) + (with-error-handling + (map package->definition + (filter identity + (cran-recursive-import package-name + #:repo (or (assoc-ref opts 'repo) 'cran))))) ;; Single import (let ((sexp (cran->guix-package package-name #:repo (or (assoc-ref opts 'repo) 'cran)))) -- cgit v1.2.3