GNU bug report logs - #42912
cran.git importer fails because with-store swallows extra values.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42912 in the body.
You can then email your comments to 42912 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: bug-guix <at> gnu.org
Subject: cran.git importer fails because with-store swallows extra values.
Date: Tue, 18 Aug 2020 11:50:09 +0200

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

Message #8 received at 42912 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: 42912 <at> debbugs.gnu.org
Subject: Re: bug#42912: Acknowledgement (cran.git importer fails because
 with-store swallows extra values.)
Date: Tue, 18 Aug 2020 12:40:58 +0200

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

Message #11 received at 42912 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 42912 <at> debbugs.gnu.org
Subject: Re: bug#42912: cran.git importer fails because with-store swallows
 extra values.
Date: Fri, 28 Aug 2020 23:31:01 +0200

Howdy Ricardo!

Ricardo Wurmus <rekado <at> 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’.

Message #16 received at 42912-done <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 42912-done <at> debbugs.gnu.org
Subject: Re: bug#42912: cran.git importer fails because with-store swallows
 extra values.
Date: Sat, 29 Aug 2020 09:36:08 +0200

Ludovic Courtès <ludo <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.