From patchwork Mon Jun 28 16:20:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 30764 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 12E5027BC81; Mon, 28 Jun 2021 17:24:28 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 95CC027BC78 for ; Mon, 28 Jun 2021 17:24:27 +0100 (BST) Received: from localhost ([::1]:56440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lxu3e-0003cO-Lk for patchwork@mira.cbaines.net; Mon, 28 Jun 2021 12:24:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lxu0N-0004lv-IT for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lxu0N-0000UF-9i for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lxu0N-0005Wl-79 for guix-patches@gnu.org; Mon, 28 Jun 2021 12:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49196] [PATCH v4 2/3] import: utils: Skip not found packages. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jun 2021 16:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49196@debbugs.gnu.org Cc: iskarian@mgsn.dev Received: via spool by 49196-submit@debbugs.gnu.org id=B49196.162489723721150 (code B ref 49196); Mon, 28 Jun 2021 16:21:03 +0000 Received: (at 49196) by debbugs.gnu.org; 28 Jun 2021 16:20:37 +0000 Received: from localhost ([127.0.0.1]:52331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtzw-0005V4-Cr for submit@debbugs.gnu.org; Mon, 28 Jun 2021 12:20:37 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:38776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxtzp-0005UV-Jp for 49196@debbugs.gnu.org; Mon, 28 Jun 2021 12:20:35 -0400 Received: by mail-wr1-f46.google.com with SMTP id r8so8204686wrx.5 for <49196@debbugs.gnu.org>; Mon, 28 Jun 2021 09:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rty0ZqD+74SEHhUaLtCsSlBbmFKBoQTnN3k5Vftk+7k=; b=QGnuDnBzuU6Yo0rhapoQIUuzDIFTOtIzfTIzNGlYw8txbE8rnayWpl47QpplG4yFob Fsb95I4xBKe64ul7bZFJFLy5nvkkxM4zlyAfp1A3NQN+HV/k+XKUIfCoWDNLun8/345b VCg4CYdk9qktsCa6RgGmg8DJsvkCfsPDwNX9OLbs7hnFAGQB+j0pnp2Sg0O7cz/X7pZs aarou4FD9RCJWR3tizLmmLDBticLhpTFTn0yiDjPWNzaAJDxh4Mpm3+ZyHFzK0ZWcKso pW408AhSD4MZTCSyWXO7pBwxm5yrYh1xy1LN2FB0ryxNzjycwD/7yLsk434tgYPCofuq xZJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rty0ZqD+74SEHhUaLtCsSlBbmFKBoQTnN3k5Vftk+7k=; b=p5HOY1s5qyJSwoIuolaqfCqW8bdSEqBQJ8Yk17w0Rmu7dQitdht9sAkX0A5VLV3iMa gJy9DuKaHFOoeZR4o9nsbxAUnmkgmEbbH8MWNvtbcmh8Cu2NlS4VCGy9FbqY3dpJ+gqc VXoGmP48HOzuWtiiYGfpFNM2PKMmauoJruo7oAjl2Q/t+RmFWaiSIgdUy9IFgWhmiMyr cgOzc524j3K0bTvP23ppgHoqPcWNQhzniFbg8LL8MNbrxIU1msBj17ExwncMDmLBZqFu 97NYUDeqAhQt9AxxOC85W6mm4Sbn3Jp7V8xvltCJGTqy4KggiSgL/Bs0roNbK6lVYbQN RK0Q== X-Gm-Message-State: AOAM5334BBnsJrKXo7uaDRIP39EY5tfgxq8+9S9KvWEZ4z7TdyPX5Uf3 3dNIEtcG/wfAM5CtCeMw+B/L3zAxNmI= X-Google-Smtp-Source: ABdhPJz+s04ntMiKNgglNM3GXUWKW1YRF7NXCNBP+gfQTAGMCKbxCL6H7HbaVMgnQkmIMZblbIJFYg== X-Received: by 2002:adf:f690:: with SMTP id v16mr12259239wrp.411.1624897224033; Mon, 28 Jun 2021 09:20:24 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id v18sm17050567wrv.24.2021.06.28.09.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 09:20:23 -0700 (PDT) From: zimoun Date: Mon, 28 Jun 2021 18:20:13 +0200 Message-Id: <20210628162014.15319-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210628162014.15319-1-zimon.toutoune@gmail.com> References: <20210628162014.15319-1-zimon.toutoune@gmail.com> 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 From: Sarah Morgensen * guix/import/utils.scm (recursive-import): Skip packages when the package returned by 'repo->guix-package' is false. * tests/import-utils.scm: New tests. --- guix/import/utils.scm | 26 ++++++++++++++------------ tests/import-utils.scm | 28 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index d817318a91..7f2e7ecb46 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -471,15 +472,16 @@ to obtain the Guix package name corresponding to the upstream name." (name (list name #f))) dependencies))) (make-node name version package normalized-deps))) - (map node-package - (topological-sort (list (lookup-node package-name version)) - (lambda (node) - (map (lambda (name-version) - (apply lookup-node name-version)) - (remove (lambda (name-version) - (apply exists? name-version)) - (node-dependencies node)))) - (lambda (node) - (string-append - (node-name node) - (or (node-version node) "")))))) + (filter-map + node-package + (topological-sort (list (lookup-node package-name version)) + (lambda (node) + (map (lambda (name-version) + (apply lookup-node name-version)) + (remove (lambda (name-version) + (apply exists? name-version)) + (node-dependencies node)))) + (lambda (node) + (string-append + (node-name node) + (or (node-version node) "")))))) diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 874816442e..7c6c782917 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +65,33 @@ '()))) #:guix-name identity)) +(test-equal "recursive-import: skip false packages (toplevel)" + '() + (recursive-import "foo" + #:repo 'repo + #:repo->guix-package + (match-lambda* + (("foo" #:version #f #:repo 'repo) + (values #f '()))) + #:guix-name identity)) + +(test-equal "recursive-import: skip false packages (dependency)" + '((package + (name "foo") + (inputs `(("bar" ,bar))))) + (recursive-import "foo" + #:repo 'repo + #:repo->guix-package + (match-lambda* + (("foo" #:version #f #:repo 'repo) + (values '(package + (name "foo") + (inputs `(("bar" ,bar)))) + '("bar"))) + (("bar" #:version #f #:repo 'repo) + (values #f '()))) + #:guix-name identity)) + (test-assert "alist->package with simple source" (let* ((meta '(("name" . "hello") ("version" . "2.10")