summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-12-04 12:28:53 +0100
committerRicardo Wurmus <rekado@elephly.net>2020-12-04 12:28:53 +0100
commit2bbe6b300e6aa769ae88408f5a266fa7a9fd815f (patch)
tree7d59d78bda02d1f71604b555b81ee86698ced181
parenta689c85af4752b3fc466489e06d49ccab5f37de1 (diff)
import/cran: Do not attempt to generate definitions for failed imports.
* guix/scripts/import/cran.scm (guix-import-cran): Remove failed imports from list of packages to define.
-rw-r--r--guix/scripts/import/cran.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/scripts/import/cran.scm b/guix/scripts/import/cran.scm
index bc266ad9da..33944c4a3f 100644
--- a/guix/scripts/import/cran.scm
+++ b/guix/scripts/import/cran.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;;
;;; This file is part of GNU Guix.
@@ -98,8 +98,9 @@ Import and convert the CRAN package for PACKAGE-NAME.\n"))
(if (assoc-ref opts 'recursive)
;; Recursive import
(map package->definition
- (cran-recursive-import package-name
- #:repo (or (assoc-ref opts 'repo) 'cran)))
+ (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))))