From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 01/12] upstream: Use a the first url from urls when find2 returns #f. Date: Sun, 11 Dec 2016 18:25:26 +0100 Message-ID: <20161211172537.23315-2-david@craven.ch> References: <20161211172537.23315-1-david@craven.ch> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cG7tB-0008Ne-2v for guix-devel@gnu.org; Sun, 11 Dec 2016 12:26:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cG7t7-0001Ba-Vi for guix-devel@gnu.org; Sun, 11 Dec 2016 12:26:17 -0500 Received: from so254-10.mailgun.net ([198.61.254.10]:22120) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cG7t7-00015j-Qb for guix-devel@gnu.org; Sun, 11 Dec 2016 12:26:13 -0500 In-Reply-To: <20161211172537.23315-1-david@craven.ch> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * guix/upstream.scm (package-update): Use a url from the list when the find2 procedure doesn't find a url sig-url pair. --- guix/upstream.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index 8685afd86..579942672 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -249,7 +249,7 @@ and 'interactive' (default)." (string-suffix? archive-type url)) urls (or signature-urls (circular-list #f))))) - (let ((tarball (download-tarball store url signature-url + (let ((tarball (download-tarball store (if url url (car urls)) signature-url #:key-download key-download))) (values version tarball)))) (#f -- 2.11.0