bug#42912: cran.git importer fails because with-store swallows extra values.

bug#42912: cran.git importer fails because with-store swallows extra values.

[Ricardo Wurmus]

The “cran” importer has support for git and hg repositories.  This no
longer works, because the “download” is supposed to return multiple
values.  Seemingly due to the use of “with-store” it no longer returns
multiple values, so the “git” and “hg” archives no longer work.

-- 
Ricardo

bug#42912: Acknowledgement (cran.git importer fails because with-store swallows extra values.)

[Ricardo Wurmus]

This hack works around the problem:

--8<---------------cut here---------------start------------->8---
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index a1275b4822..e10ea25587 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -197,10 +197,17 @@ bioconductor package NAME, or #F if the package is unknown."
 (define download
   (memoize
    (lambda* (url #:key method)
+     (define v1 #f)
+     (define v2 #f)
      (with-store store
        (cond
         ((eq? method 'git)
-         (latest-repository-commit store url))
+         (call-with-values
+             (lambda ()
+               (latest-repository-commit store url))
+           (lambda (dir commit)
+             (set! v1 dir)
+             (set! v2 commit))))
         ((eq? method 'hg)
          (call-with-temporary-directory
           (lambda (dir)
@@ -214,8 +221,10 @@ bioconductor package NAME, or #F if the package is unknown."
                           (find-files dir "^\\.hg$" #:directories? #t))
                 (let ((store-directory
                        (add-to-store store (basename url) #t "sha256" dir)))
-                  (values store-directory changeset)))))))
-        (else (download-to-store store url)))))))
+                  (set! v1 store-directory)
+                  (set! v2 changeset)))))))
+        (else (set! v1 (download-to-store store url)))))
+     (values v1 v2))))
 
 (define (fetch-description repository name)
   "Return an alist of the contents of the DESCRIPTION file for the R package
--8<---------------cut here---------------end--------------->8---

-- 
Ricardo

bug#42912: cran.git importer fails because with-store swallows extra values.

[Ludovic Courtès]

Howdy Ricardo!

Ricardo Wurmus <rekado@elephly.net> skribis:

> The “cran” importer has support for git and hg repositories.  This no
> longer works, because the “download” is supposed to return multiple
> values.  Seemingly due to the use of “with-store” it no longer returns
> multiple values, so the “git” and “hg” archives no longer work.

I believe 3d9ea605c8dfb7fc43689e12975218b032b3175a fixes this, though I
don’t know how to test it.

If you can confirm it does, feel free to close this bug.

Thanks,
Ludo’.

bug#42912: cran.git importer fails because with-store swallows extra values.

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> I believe 3d9ea605c8dfb7fc43689e12975218b032b3175a fixes this, though I
> don’t know how to test it.
>
> If you can confirm it does, feel free to close this bug.

It looks like it’s indeed fixed.  Thank you!

I tested with this command:

    guix import cran -a git https://github.com/immunogenomics/harmony

-- 
Ricardo