guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/13: import: cran: Return multiple values for unknown packages.


From: guix-commits
Subject: 10/13: import: cran: Return multiple values for unknown packages.
Date: Mon, 7 Mar 2022 16:50:54 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 7229b0e85826e8c752bfe64334901c747951ccf2
Author: zimoun <zimon.toutoune@gmail.com>
AuthorDate: Tue Jan 19 16:47:20 2021 +0100

    import: cran: Return multiple values for unknown packages.
    
    Partly fixes <https://bugs.gnu.org/44115>.
    
    * guix/import/pypi.scm (cran->guix-package): Return 'values'.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/import/cran.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 7a73c11382..e848ebc789 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -606,9 +607,7 @@ s-expression corresponding to that package, or #f on 
failure."
               ;; Retry import from CRAN
               (cran->guix-package package-name #:repo 'cran))
              (else
-              (raise (condition
-                      (&message
-                       (message "couldn't find meta-data for R 
package")))))))))))
+              (values #f '()))))))))
 
 (define* (cran-recursive-import package-name #:key (repo 'cran) version)
   (recursive-import package-name



reply via email to

[Prev in Thread] Current Thread [Next in Thread]