01/02: import: cran: Retry failed git imports on Bioconductor.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit c7358ac4fc6369cdf87f95ec8600a21e809a22eb
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Sep 2 14:45:17 2019 +0200

    import: cran: Retry failed git imports on Bioconductor.
    
    * guix/import/cran.scm (cran->guix-package): Retry failed git imports on
    Bioconductor.
---
 guix/import/cran.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 51c7ea7..b5321b4 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -494,12 +494,16 @@ from the alist META, which was derived from the R 
package's DESCRIPTION file."
      "Fetch the metadata for PACKAGE-NAME from REPO and return the `package'
 s-expression corresponding to that package, or #f on failure."
      (let ((description (fetch-description repo package-name)))
-       (if (and (not description)
-                (eq? repo 'bioconductor))
-           ;; Retry import from CRAN
-           (cran->guix-package package-name 'cran)
-           (and description
-                (description->package repo description)))))))
+       (if description
+           (description->package repo description)
+           (case repo
+             ((git)
+              ;; Retry import from Bioconductor
+              (cran->guix-package package-name 'bioconductor))
+             ((bioconductor)
+              ;; Retry import from CRAN
+              (cran->guix-package package-name 'cran))
+             (else #f)))))))
 
 (define* (cran-recursive-import package-name #:optional (repo 'cran))
   (recursive-import package-name repo