From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UKTSCxNgtGOeFQAAbAwnHQ (envelope-from ) for ; Tue, 03 Jan 2023 18:04:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id gKfrChNgtGNqNQEAG6o9tA (envelope-from ) for ; Tue, 03 Jan 2023 18:04:19 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E6C2B1362D for ; Tue, 3 Jan 2023 18:04:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCkhn-0001uX-I1; 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-0001sv-J2 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-0000zD-BD 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 1pCkhl-0003Ga-TT for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60520] [PATCH 2/4] gnu-maintenance: 'gnu' and 'gnu-ftp' predicates catch networking errors. 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:01 +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.167276541612502 (code B ref 60520); Tue, 03 Jan 2023 17:04:01 +0000 Received: (at 60520) by debbugs.gnu.org; 3 Jan 2023 17:03:36 +0000 Received: from localhost ([127.0.0.1]:46595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkhL-0003Fa-UQ for submit@debbugs.gnu.org; Tue, 03 Jan 2023 12:03:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkhI-0003F0-Ez 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 1pCkhC-0000wq-LI; Tue, 03 Jan 2023 12:03:26 -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=UFQivEDz9Xnvt6GA47FbhTCdpjbx+TeMyi827ABL3wE=; b=N5E1sKQ+qGJTCgtnOo4v 96lU9KUHtQlpK0Q/dS23H3TWNBcc48uG7IR4mL+ekRwC5QInrwCrwr6i83nsvlEJl9qvWV0TSi7bt pujmTHSdXi5D1REgK+4drTVa+Kd2LtLziEW7VOX9r8epLDv6OvqdYxG5AnpO5dFgT9iJ11AUPJTo+ QF4VsW5KUAGmxD/BXzWNbvsM9QMIQV0FAoZx2UsGH3kw0wjAvd/zcxVi+EckES0KMCnDzb0kPsxkA yLhm3YesvpAlMyz+pA7OYdJTtG2Kjvbh5rC3M1fLSomsFw75WRYfsfBD1fyMOAX/M1PwDTG7or7tr llzw8AvF2WpImg==; 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-7g; Tue, 03 Jan 2023 12:03:26 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 3 Jan 2023 18:03:17 +0100 Message-Id: <20230103170319.16637-2-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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672765459; a=rsa-sha256; cv=none; b=L53aMdKolKTM2/HrWffJt1XH9DRBETGKr1dicveXMHWbozyauKUSV4p7hWMlGCizbcK255 08SRuqoZsMDZRQAB17neO45Q/j6iA0lJIZ34ysg/lyr9ikUpVEoEX+D0M/L+KqjlHqzVg4 H0vi1AS3MobczIHKZWEQYxtSI57jlXVZj7//irf21V2+iFLAQTc/CJPrv8ey8bRclLSm+g TiUb2OLaROgO9zTi/YlTsl3FjJRCBVSftiBaNSyO5yqwHQXbGdJAzYXPQtycgqUwPPgXe7 2Pr6mH6IwVhBYmd5SYhK02e76P0MkglLkxHM8yjgHj0A9GugxSbitYdora+yWQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=N5E1sKQ+; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672765458; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=UFQivEDz9Xnvt6GA47FbhTCdpjbx+TeMyi827ABL3wE=; b=JI/zi/TcjBON8vkGz8aCMlxrCwzp5Kq7k3ErMGf+C6BV3l7SS3meYbWypFTP0c661o5++E PsnPhtJQ6gL1/NTVdBeDhlNWzssopj59LcrQlIyxzL3bnDx0+PPd1tjcjdx37O7CLenVwU 8+uPX29a21HQlTXEEObVdp1D6exlq3KZJVxLXqM/ckdrNYTXSyeCNIPREoN6e6t9KTN6Dp RedWfkDz7XF8MOgI6laZO4IlKfLBhzlm9WxPSDZnCK3G9UkGUue/V9NmvmlyRymtgtdQv3 uF/Y+Yx8J7R3qXBB/0iCAWxr/6vbPu030b4D6sysGo1wWKTKCMMrX1rl2WfbkA== X-Spam-Score: -3.36 X-Migadu-Queue-Id: E6C2B1362D Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=N5E1sKQ+; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -3.36 X-TUID: haTATu8a68CW Previously, in a networking-less environment such as 'guix shell -C -D guix', 'guix refresh --list-updaters' would crash due to a 'gettaddrinfo-error' exception in these predicates. * guix/gnu-maintenance.scm (%gnu-updater)[pred]: Wrap in 'false-if-networking-error'. (%gnu-ftp-updater)[pred]: Likewise. --- guix/gnu-maintenance.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 0418c297f2..0aa70243b5 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -883,7 +883,8 @@ (define %gnu-updater (upstream-updater (name 'gnu) (description "Updater for GNU packages") - (pred gnu-hosted?) + (pred (lambda (package) + (false-if-networking-error (gnu-hosted? package)))) (import import-gnu-release))) (define %gnu-ftp-updater @@ -893,8 +894,9 @@ (define %gnu-ftp-updater (name 'gnu-ftp) (description "Updater for GNU packages only available via FTP") (pred (lambda (package) - (and (not (gnu-hosted? package)) - (pure-gnu-package? package)))) + (false-if-networking-error + (and (not (gnu-hosted? package)) + (pure-gnu-package? package))))) (import import-release*))) (define %savannah-updater -- 2.38.1