From patchwork Tue Jan 3 17:03:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 45826 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 F273227BBED; Tue, 3 Jan 2023 17:04:27 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 7510127BBE9 for ; Tue, 3 Jan 2023 17:04:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCkhn-0001uf-Ql; Tue, 03 Jan 2023 12:04:03 -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 1pCkhm-0001tA-NF for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pCkhm-0000zL-FO for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCkhm-0003Gi-AI for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60520] [PATCH 3/4] import: stackage: Catch networking errors in predicate. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Jan 2023 17:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60520 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60520@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 60520-submit@debbugs.gnu.org id=B60520.167276541812513 (code B ref 60520); Tue, 03 Jan 2023 17:04:02 +0000 Received: (at 60520) by debbugs.gnu.org; 3 Jan 2023 17:03:38 +0000 Received: from localhost ([127.0.0.1]:46597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkhO-0003Fj-8s for submit@debbugs.gnu.org; Tue, 03 Jan 2023 12:03:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkhI-0003F1-Gy for 60520@debbugs.gnu.org; Tue, 03 Jan 2023 12:03:34 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pCkhD-0000ww-8i; Tue, 03 Jan 2023 12:03:27 -0500 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=2aAReSiBQ5mzUJmPDnvztZzTdcvt5enb/NCpmi4UhW8=; b=G3ccTJyDQdQDsP/XC3LE adovzx0W58jZueaVLxcscl3ANwKXQz9FAwN4Rv538dIfBKRm1sKrE08mGnfGUVEK5GuGJBaj98HnY PqDbKCZYGQELz4YaU+9VPtzNF6piGf0yuBjqdGNNJ+fIZg9NbgWyHkryeiUcl9exrZtGW7JqSHbsl sWl/vZxb9OlSd5D9+iIGEh5WqnszyVpB/5dtNlK+Hoh6q97NcjMu8dGezzuzH3t0xI56sxtVW70F9 wpnMKFaBYCJtKbkn5VGGXkqIaBc7QA29Kx1zX5yeBmlxln3biV326+5Y9A8pbo40WKFKhgHPU7Cpi H6aJpRoTbsrVgg==; Received: from [193.50.110.60] (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 1pCkhC-000697-TN; Tue, 03 Jan 2023 12:03:27 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 3 Jan 2023 18:03:18 +0100 Message-Id: <20230103170319.16637-3-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230103170319.16637-1-ludo@gnu.org> References: <20230103170319.16637-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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/stackage.scm (stackage-lts-package?): Wrap body in 'false-if-networking-error'. --- guix/import/stackage.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 70d3e271f4..c0284e48a4 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Xinglu Chem -;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021, 2023, 2023 Ludovic Courtès ;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. @@ -170,12 +170,13 @@ (define latest-lts-release (define (stackage-lts-package? package) "Return whether PACKAGE is available on the default Stackage LTS release." (and (hackage-package? package) - (let ((packages (stackage-lts-packages - (stackage-lts-info-fetch %default-lts-version))) - (hackage-name (guix-package->hackage-name package))) - (find (lambda (package) - (string=? (stackage-package-name package) hackage-name)) - packages)))) + (false-if-networking-error + (let ((packages (stackage-lts-packages + (stackage-lts-info-fetch %default-lts-version))) + (hackage-name (guix-package->hackage-name package))) + (find (lambda (package) + (string=? (stackage-package-name package) hackage-name)) + packages))))) (define %stackage-updater (upstream-updater