From patchwork Fri Oct 29 21:35:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 34140 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 40DE527BBE3; Fri, 29 Oct 2021 22:53:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0AA3127BBE1 for ; Fri, 29 Oct 2021 22:53:03 +0100 (BST) Received: from localhost ([::1]:57396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgZo6-0002EO-4H for patchwork@mira.cbaines.net; Fri, 29 Oct 2021 17:53:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgZYe-0004Rs-FY for guix-patches@gnu.org; Fri, 29 Oct 2021 17:37:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mgZYc-0004S2-Jb for guix-patches@gnu.org; Fri, 29 Oct 2021 17:37:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mgZYc-0006GY-I5 for guix-patches@gnu.org; Fri, 29 Oct 2021 17:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51493] [PATCH 4/5] import: print: Correctly handle URI lists. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Oct 2021 21:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51493 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51493@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 51493-submit@debbugs.gnu.org id=B51493.163554336623985 (code B ref 51493); Fri, 29 Oct 2021 21:37:02 +0000 Received: (at 51493) by debbugs.gnu.org; 29 Oct 2021 21:36:06 +0000 Received: from localhost ([127.0.0.1]:56156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgZXi-0006Em-BM for submit@debbugs.gnu.org; Fri, 29 Oct 2021 17:36:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgZXX-0006Cz-2O for 51493@debbugs.gnu.org; Fri, 29 Oct 2021 17:35:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:58454) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgZXR-0002Ll-Qp; Fri, 29 Oct 2021 17:35:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=zKkZ8FFV++01i/tetLce2XBA/9nwKRcGk/8k3D8XA2I=; b=HJzH0wQlOL3XNfhFfUrZ pR4NXs441GcaGEngh+GnXyp9IOmEsMaCzJSA1QydREIkgLFJ+YRXlgK1D0fpiKwesiEashWuerRoR p0PI6g/lmybobrCOzITILBb+hDE5ZU1Ns9bsIk2I9g27tAjgCTFXcjmbEIiiYzy27XI6VbM1hlezv 7bLs3KtlK7gskkMfFwhCeSg7svY4Eg/wTlpeJpN/6VMYaUCWCqMYZTP7IT0DM8eJToGXJ7OWPbRjC 2FNGxPABa9u+s7VZ5SsmoBLZeE8gpbctG9HhHe6P9w7+Ls2aDvdfoJ9CoSo3P4ioZDsJwX/QTpptH xkF+jnm1YSnCmg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:55462 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mgZXR-0002gP-Cd; Fri, 29 Oct 2021 17:35:49 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 29 Oct 2021 23:35:38 +0200 Message-Id: <20211029213539.30291-4-ludo@gnu.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211029213539.30291-1-ludo@gnu.org> References: <20211029213539.30291-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/import/print.scm (package->code)[factorized-uri-code]: New procedure. [source->code]: Use it, and factorize URI when it's a list. * tests/print.scm (pkg-with-origin-input): Check origin URI to a list. --- guix/import/print.scm | 15 ++++++++++++--- tests/print.scm | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/guix/import/print.scm b/guix/import/print.scm index 8acf5d52f6..4e65d18bc3 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -25,6 +25,7 @@ (define-module (guix import print) #:use-module (guix build-system) #:use-module (gnu packages) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (guix import utils) #:use-module (ice-9 control) #:use-module (ice-9 match) @@ -72,6 +73,11 @@ (define (search-path-specification->code spec) (file-type (quote ,(search-path-specification-file-type spec))) (file-pattern ,(search-path-specification-file-pattern spec)))) + (define (factorized-uri-code uri version) + (match (factorize-uri uri version) + ((? string? uri) uri) + ((factorized ...) `(string-append ,@factorized)))) + (define (source->code source version) (let ((uri (origin-uri source)) (method (origin-method source)) @@ -90,9 +96,12 @@ (define (source->code source version) (guix svn-download))) (procedure-name method))) (uri ,(if version - `(string-append ,@(match (factorize-uri uri version) - ((? string? uri) (list uri)) - (factorized factorized))) + (match uri + ((? string? uri) + (factorized-uri-code uri version)) + ((lst ...) + `(list + ,@(map (cut factorized-uri-code <> version) uri)))) uri)) ,(if (equal? (content-hash-algorithm hash) 'sha256) `(sha256 (base32 ,(bytevector->nix-base32-string diff --git a/tests/print.scm b/tests/print.scm index ad19f4573a..7f4c8ccdd1 100644 --- a/tests/print.scm +++ b/tests/print.scm @@ -73,8 +73,10 @@ (define-with-source pkg-with-origin-input pkg-with-origin-input-source (version "1.2.3") (source (origin (method url-fetch) - (uri (string-append "file:///tmp/test-" - version ".tar.gz")) + (uri (list (string-append "file:///tmp/test-" + version ".tar.gz") + (string-append "http://example.org/test-" + version ".tar.gz"))) (sha256 (base32 "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah"))))