From patchwork Tue Dec 19 11:19:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 57709 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 46D6927BBEA; Tue, 19 Dec 2023 11:21:23 +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 66B0827BBE9 for ; Tue, 19 Dec 2023 11:21:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFY9q-00089b-GT; Tue, 19 Dec 2023 06:21:06 -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 1rFY9l-000883-8W for guix-patches@gnu.org; Tue, 19 Dec 2023 06:21:02 -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 1rFY9k-0004WL-FT for guix-patches@gnu.org; Tue, 19 Dec 2023 06:21:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFY9m-0001y7-JD for guix-patches@gnu.org; Tue, 19 Dec 2023 06:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67898] [PATCH] guix: import: composer: Handle parsing failures. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Dec 2023 11:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67898@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17029848187390 (code B ref -1); Tue, 19 Dec 2023 11:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2023 11:20:18 +0000 Received: from localhost ([127.0.0.1]:34506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFY93-0001v7-Ny for submit@debbugs.gnu.org; Tue, 19 Dec 2023 06:20:18 -0500 Received: from lists.gnu.org ([2001:470:142::17]:44434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFY92-0001uZ-GQ for submit@debbugs.gnu.org; Tue, 19 Dec 2023 06:20:17 -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 1rFY8t-000848-3C for guix-patches@gnu.org; Tue, 19 Dec 2023 06:20:08 -0500 Received: from 5.mo584.mail-out.ovh.net ([188.165.44.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFY8V-00046s-BO for guix-patches@gnu.org; Tue, 19 Dec 2023 06:20:05 -0500 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.139.129]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 66B68202C6 for ; Tue, 19 Dec 2023 11:19:38 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-64495 (unknown [10.110.178.109]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 230661FD5F; Tue, 19 Dec 2023 11:19:38 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-64495 with ESMTPSA id Md+8BEp8gWVWpAEA4uFpDA (envelope-from ); Tue, 19 Dec 2023 11:19:38 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0041189e5a2-81f6-4b19-a600-925af4365f50, 0A183DEDD9F7D7733B4F13041BD52F66DC821FED) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Tue, 19 Dec 2023 12:19:31 +0100 Message-ID: <20231219111932.8729-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 8955970811413717725 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvddutddgvdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=188.165.44.50; envelope-from=ngraves@ngraves.fr; helo=5.mo584.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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. Change-Id: I14936c2c6e6a850a32fe56891766ae92b693a295 --- guix/import/composer.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/guix/import/composer.scm b/guix/import/composer.scm index 069a950f90..b40285620d 100644 --- a/guix/import/composer.scm +++ b/guix/import/composer.scm @@ -246,13 +246,18 @@ (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))))) + (package (composer-fetch php-name #:version version))) + (match package + (#f + (format (current-error-port) + "warning: failed to parse ~a~%" + php-name) + #f) + (_ + (upstream-source + (package (composer-package-name package)) + (version (composer-package-version package)) + (urls (composer-source-url (composer-package-source package)))))))) (define %composer-updater (upstream-updater