From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4BPzNpuwO19/WAAA0tVLHw (envelope-from ) for ; Tue, 18 Aug 2020 10:42:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sDzHMpuwO1+1BQAA1q6Kng (envelope-from ) for ; Tue, 18 Aug 2020 10:42:35 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 65E7C9402C2 for ; Tue, 18 Aug 2020 10:42:34 +0000 (UTC) Received: from localhost ([::1]:38062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7z4a-0006V2-71 for larch@yhetil.org; Tue, 18 Aug 2020 06:42:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7z46-00064S-Rn for bug-guix@gnu.org; Tue, 18 Aug 2020 06:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50866) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7z46-0003JZ-IG for bug-guix@gnu.org; Tue, 18 Aug 2020 06:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k7z46-00061p-Fx for bug-guix@gnu.org; Tue, 18 Aug 2020 06:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#42912: Acknowledgement (cran.git importer fails because with-store swallows extra values.) Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 18 Aug 2020 10:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42912 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 42912@debbugs.gnu.org Received: via spool by 42912-submit@debbugs.gnu.org id=B42912.159774727223103 (code B ref 42912); Tue, 18 Aug 2020 10:42:02 +0000 Received: (at 42912) by debbugs.gnu.org; 18 Aug 2020 10:41:12 +0000 Received: from localhost ([127.0.0.1]:34176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7z3I-00060Z-7X for submit@debbugs.gnu.org; Tue, 18 Aug 2020 06:41:12 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7z3D-00060L-Fs for 42912@debbugs.gnu.org; Tue, 18 Aug 2020 06:41:11 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1597747265; cv=none; d=zohomail.com; s=zohoarc; b=R9i0ooEA441gk73filKtG8zcz6/JMJdBJXTq7lk1fq5KRNwaw8WSuTBq571XAasvBtfUye0oxoMFn6FoES6Y8ZLMZ+WkVbUGfCCLWuTqvRFGaTXgIEelF3XbyoAEiFGwmk1DspfV+FgurmccAAmiZIlzgTqdp3EsY/l7HYtJdZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597747265; h=Content-Type:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VvNbySY5/JE+uYrr+KpTqj4nrRSa5k3onR4N66AreGQ=; b=X1gO3ZNP9kVrm+DZI0eRCAfUszXrPY0V1DcPr2rIyOASIb62MI7/NL8rgyeRVhILdoYEY0SpAxpmJ9YyuIXxI+vueVAU2pSbAugB8FbRqt2rr4BhOPbU5wG8MedYPAzOtUssvabYjnocysmxiszCjHx+S07vizcOE/Pd1Yrel5k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1597747265; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type; bh=VvNbySY5/JE+uYrr+KpTqj4nrRSa5k3onR4N66AreGQ=; b=DGBFxbpIjI4B9DOFNXp5GZJaTRwQgXOdgb/3XfXI1f3jRwlG1+ilW1iaOd+P77J8 8qL5OrWXw7yftAGp7tOah9jLp4zUI1ZXFL1CYxkIl+2ekE59g5ljmhZ2ckPSz24P/EG ITTs0V8Tp2Vg6f429BXVb+pkfDuoP7HU99xAg/eY= Received: from localhost (p54ad4c5e.dip0.t-ipconnect.de [84.173.76.94]) by mx.zohomail.com with SMTPS id 1597747261328476.43155413921477; Tue, 18 Aug 2020 03:41:01 -0700 (PDT) References: <87y2mcxoz2.fsf@elephly.net> User-agent: mu4e 1.4.10; emacs 26.3 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Tue, 18 Aug 2020 12:40:58 +0200 Message-ID: <87pn7oxmmd.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=elephly.net header.s=zoho header.b=DGBFxbpI; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 1.99 X-TUID: 5BR1iFlowxYK 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