From patchwork Tue Dec 19 11:38:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 57710 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 4E64427BBEA; Tue, 19 Dec 2023 11:40:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 90D5B27BBE9 for ; Tue, 19 Dec 2023 11:40:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFYSA-0003b8-KJ; Tue, 19 Dec 2023 06:40:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFYS8-0003aS-PX for guix-patches@gnu.org; Tue, 19 Dec 2023 06:40:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFYS8-0008Ut-HP for guix-patches@gnu.org; Tue, 19 Dec 2023 06:40:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFYSA-0005o9-Mt for guix-patches@gnu.org; Tue, 19 Dec 2023 06:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67898] [PATCH v2] guix: import: composer: Handle parsing failures. References: <20231219111932.8729-1-ngraves@ngraves.fr> In-Reply-To: <20231219111932.8729-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 11:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67898@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 67898-submit@debbugs.gnu.org id=B67898.170298597022197 (code B ref 67898); Tue, 19 Dec 2023 11:40:02 +0000 Received: (at 67898) by debbugs.gnu.org; 19 Dec 2023 11:39:30 +0000 Received: from localhost ([127.0.0.1]:34515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFYRe-0005lw-0T for submit@debbugs.gnu.org; Tue, 19 Dec 2023 06:39:30 -0500 Received: from 4.mo561.mail-out.ovh.net ([178.33.46.10]:36001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFYRa-0005ld-Oe for 67898@debbugs.gnu.org; Tue, 19 Dec 2023 06:39:28 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.176.202]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 641DD2C2C5 for <67898@debbugs.gnu.org>; Tue, 19 Dec 2023 11:39:22 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-2cqcn (unknown [10.110.178.151]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id EFCA71FDEB; Tue, 19 Dec 2023 11:39:21 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-2cqcn with ESMTPSA id 48VcN+mAgWUd7wkAR6sYHw (envelope-from ); Tue, 19 Dec 2023 11:39:21 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R004a9f79bf9-55cd-43df-bef2-4a603dc651ad, 0A183DEDD9F7D7733B4F13041BD52F66DC821FED) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Tue, 19 Dec 2023 12:38:56 +0100 Message-ID: <20231219113857.21287-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 9289237182686290653 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvddutddgfedtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeijeekleekseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/composer (latest-release): Handle parsing failures. Rename package to composer-package for clarity. Change-Id: I14936c2c6e6a850a32fe56891766ae92b693a295 --- guix/import/composer.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/guix/import/composer.scm b/guix/import/composer.scm index 069a950f90..b23af1b91f 100644 --- a/guix/import/composer.scm +++ b/guix/import/composer.scm @@ -246,13 +246,19 @@ (define (php-package? package) (define* (latest-release package #:key (version #f)) "Return an for the latest release of PACKAGE." (let* ((php-name (guix-package->composer-name package)) - (package (composer-fetch php-name #:version version)) - (version (composer-package-version package)) - (url (composer-source-url (composer-package-source package)))) - (upstream-source - (package (composer-package-name package)) - (version version) - (urls (list url))))) + (composer-package (composer-fetch php-name #:version version))) + (match composer-package + (#f + (format (current-error-port) + "warning: failed to parse ~a~%" + php-name) + #f) + (_ + (upstream-source + (package (composer-package-name composer-package)) + (version (composer-package-version composer-package)) + (urls (list (composer-source-url + (composer-package-source composer-package))))))))) (define %composer-updater (upstream-updater