From patchwork Tue Jan 3 17:03:16 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: 45828 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 459C127BBE9; Tue, 3 Jan 2023 17:04: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=-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=unavailable 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 EF04B27BBEB for ; Tue, 3 Jan 2023 17:04:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCkho-0001vS-Vn; Tue, 03 Jan 2023 12:04:05 -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 1pCkhn-0001uJ-30 for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:03 -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-0000zS-QQ 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-0003Gp-Ls for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60520] [PATCH 1/4] gnu-maintenance: Factorize 'false-if-networking-failure'. References: <20230103164439.16477-1-ludo@gnu.org> In-Reply-To: <20230103164439.16477-1-ludo@gnu.org> 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.167276541912521 (code B ref 60520); Tue, 03 Jan 2023 17:04:02 +0000 Received: (at 60520) by debbugs.gnu.org; 3 Jan 2023 17:03:39 +0000 Received: from localhost ([127.0.0.1]:46599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkhO-0003Fm-OG for submit@debbugs.gnu.org; Tue, 03 Jan 2023 12:03:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkhI-0003Ez-0Q for 60520@debbugs.gnu.org; Tue, 03 Jan 2023 12:03:35 -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 1pCkhB-0000wi-Vy; 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:Date:Subject:To:From:in-reply-to: references; bh=okUZsg9FWPTpEpVGLVUwPtfXHEleU2P6DAPAUSbe1NU=; b=V7vG/mau89D/Lu D3M/l1acNBE0afDCxp1amOYh3wkT2VwATB3R9figQ8pCZ9LWw66qoZu+iCyoDRMjYEdre+8ODU/ZR BBgblh5YFZVLjE3wOseqUsFB/wA1QIICtNX2T2OAstTxdM8fk623zIWAJjWacumNAERjheqt5/A/K ONGSYLe6iATTgyfaH7o6oqaP8Kk49FsjnWGY4qBTmWmc6zbqaEP4RlYkQowwEAte5IxTUUycS6zl5 IbpvCfBUMxAhz+Zdi35hGVpWN7AEzuKAMjPMMUzPBgbbONTmY2dvlxqQ4Wv/nTT9lbCKeL5oSf2e+ ysV5ROyn3U9vDm54W1/Q==; 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 1pCkhB-000697-KL; Tue, 03 Jan 2023 12:03:25 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 3 Jan 2023 18:03:16 +0100 Message-Id: <20230103170319.16637-1-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 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/utils.scm (call-with-networking-exception-handler): New procedure. (false-if-networking-error): New macro. * guix/gnu-maintenance.scm (import-html-updatable-release): Use it instead of inline code. --- guix/gnu-maintenance.scm | 23 +++++++---------------- guix/import/utils.scm | 24 +++++++++++++++++++++++- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 8e60e52ea0..0418c297f2 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010-2022 Ludovic Courtès +;;; Copyright © 2010-2023 Ludovic Courtès ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2022 Maxime Devos @@ -43,6 +43,7 @@ (define-module (guix gnu-maintenance) #:use-module (guix records) #:use-module (guix upstream) #:use-module (guix packages) + #:autoload (guix import utils) (false-if-networking-error) #:autoload (zlib) (call-with-gzip-input-port) #:autoload (htmlprag) (html->sxml) ;from Guile-Lib #:export (gnu-package-name @@ -871,21 +872,11 @@ (define* (import-html-updatable-release package #:key (version #f)) "" (dirname (uri-path uri)))) (package (package-upstream-name package))) - (catch #t - (lambda () - (guard (c ((http-get-error? c) #f)) - (import-html-release package - #:version version - #:base-url base - #:directory directory))) - (lambda (key . args) - ;; Return false and move on upon connection failures and bogus HTTP - ;; servers. - (unless (memq key '(gnutls-error tls-certificate-error - system-error getaddrinfo-error - bad-header bad-header-component)) - (apply throw key args)) - #f)))) + (false-if-networking-error + (import-html-release package + #:version version + #:base-url base + #:directory directory)))) (define %gnu-updater ;; This is for everything at ftp.gnu.org. diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 41311cb86e..72795d2c61 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2018, 2019, 2020, 2023 Ludovic Courtès ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2016 David Craven ;;; Copyright © 2017, 2019, 2020, 2022 Ricardo Wurmus @@ -54,10 +54,12 @@ (define-module (guix import utils) #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) #:use-module (srfi srfi-71) #:export (factorize-uri flatten + false-if-networking-error url-fetch guix-hash-url @@ -122,6 +124,26 @@ (define (flatten lst) (cons elem memo))) '() lst)) +(define (call-with-networking-exception-handler thunk) + "Invoke THUNK, returning #f if one of the usual networking exception is +thrown." + (catch #t + (lambda () + (guard (c ((http-get-error? c) #f)) + (thunk))) + (lambda (key . args) + ;; Return false and move on upon connection failures and bogus HTTP + ;; servers. + (unless (memq key '(gnutls-error tls-certificate-error + system-error getaddrinfo-error + bad-header bad-header-component)) + (apply throw key args)) + #f))) + +(define-syntax-rule (false-if-networking-error exp) + "Evaluate EXP, returning #f if a networking-related exception is thrown." + (call-with-networking-exception-handler (lambda () exp))) + (define (url-fetch url file-name) "Save the contents of URL to FILE-NAME. Return #f on failure." (parameterize ((current-output-port (current-error-port))) From patchwork Tue Jan 3 17:03:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 45825 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 9D9BF27BBE9; Tue, 3 Jan 2023 17:04:20 +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 C912327BBEB for ; Tue, 3 Jan 2023 17:04:18 +0000 (GMT) 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 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 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 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 From patchwork Tue Jan 3 17:03:19 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: 45827 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 E7BEE27BBEB; Tue, 3 Jan 2023 17:04:37 +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=unavailable 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 BA49127BBE9 for ; Tue, 3 Jan 2023 17:04:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCkhp-0001vU-8F; Tue, 03 Jan 2023 12:04:05 -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 1pCkhn-0001uW-Eg for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:03 -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 1pCkhn-0000zu-5A for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCkhn-0003Gw-0v for guix-patches@gnu.org; Tue, 03 Jan 2023 12:04:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60520] [PATCH 4/4] refresh: Add CLI tests. 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.167276542012528 (code B ref 60520); Tue, 03 Jan 2023 17:04:02 +0000 Received: (at 60520) by debbugs.gnu.org; 3 Jan 2023 17:03:40 +0000 Received: from localhost ([127.0.0.1]:46601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkhP-0003Fu-CT for submit@debbugs.gnu.org; Tue, 03 Jan 2023 12:03:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkhJ-0003F5-G6 for 60520@debbugs.gnu.org; Tue, 03 Jan 2023 12:03:35 -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 1pCkhE-0000x7-A9; Tue, 03 Jan 2023 12:03:28 -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=b5vnk9vausKntvza+Mf3MXBsw9FqBiYCRdXC6y9B1/U=; b=iRbcfBApMVuoHhAzo0ux hlnhTOmpmNZh+NDyonSJcSoBD17y3crpjuuYps0H1vr2vPViNxxIiVmOgNERNM+30V32pHFHBHEom eBHTH5DsOQorXuF2ZC4WnokR5kbLb8ELMjhEvH6tRxCPiiW2tmSFTMoUzi2rsI3IQlUch1e9rNy8n Ssm1r1KzGOTM30qpgrl8No3Uvkxb2eHz5qNtE6dCfC6v+3T4s0FFt1jHgMJ4DJRLpwqoekhneEhH4 iyyADOn2NKl6ZnlPkRBT6MuN6dyCBT7eVWt6hp5P90f9RdUqkX5KJFViTzzVa6tgBFoI5ZkZK4Oqf dT41yuzKhSsy7A==; 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 1pCkhD-000697-H3; Tue, 03 Jan 2023 12:03:28 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 3 Jan 2023 18:03:19 +0100 Message-Id: <20230103170319.16637-4-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/test.scm, tests/guix-refresh.sh: New files. * Makefile.am (MODULES, SH_TESTS): Add them. --- Makefile.am | 4 +- guix/import/test.scm | 88 +++++++++++++++++++++++++++++++ tests/guix-refresh.sh | 117 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 guix/import/test.scm create mode 100644 tests/guix-refresh.sh diff --git a/Makefile.am b/Makefile.am index 8b026b6da6..d9d23eec88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012-2022 Ludovic Courtès +# Copyright © 2012-2023 Ludovic Courtès # Copyright © 2013 Andreas Enge # Copyright © 2015, 2017 Alex Kost # Copyright © 2016, 2018 Mathieu Lirzin @@ -289,6 +289,7 @@ MODULES = \ guix/import/print.scm \ guix/import/pypi.scm \ guix/import/stackage.scm \ + guix/import/test.scm \ guix/import/texlive.scm \ guix/import/utils.scm \ guix/scripts.scm \ @@ -595,6 +596,7 @@ SH_TESTS = \ tests/guix-authenticate.sh \ tests/guix-environment.sh \ tests/guix-environment-container.sh \ + tests/guix-refresh.sh \ tests/guix-shell.sh \ tests/guix-shell-export-manifest.sh \ tests/guix-graph.sh \ diff --git a/guix/import/test.scm b/guix/import/test.scm new file mode 100644 index 0000000000..767dcd5b61 --- /dev/null +++ b/guix/import/test.scm @@ -0,0 +1,88 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix import test) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:use-module (web uri) + #:use-module (guix packages) + #:use-module (guix upstream) + #:use-module ((guix utils) #:select (version-prefix?)) + #:use-module (ice-9 vlist) + #:use-module (ice-9 match) + #:export (%test-updater)) + +;;; Commentary: +;;; +;;; This module defines a pseudo updater whose sole purpose is to allow +;;; testing of the whole 'guix refresh' command. +;;; +;;; Code: + +(define test-target-version + ;; VHash that maps package names to version/URL tuples. + (make-parameter + (or (and=> (getenv "GUIX_TEST_UPDATER_TARGETS") + (lambda (str) + (alist->vhash (call-with-input-string str read)))) + vlist-null))) + +(define (available-updates package) + "Return the list of available records for PACKAGE." + (vhash-fold* (lambda (version+updates result) + (match version+updates + ((version (updates ...)) + (if (version-prefix? version + (package-version package)) + (append (map (match-lambda + ((version url) + (upstream-source + (package (package-name package)) + (version version) + (urls (list url))))) + updates) + result) + result)))) + '() + (package-name package) + (test-target-version))) + +(define (test-package? package) + "Return true if PACKAGE has pseudo updates available." + (and (not (vlist-null? (test-target-version))) ;cheap test + (pair? (available-updates package)))) + +(define* (import-release package #:key (version #f)) + "Return the record denoting either the latest version of +PACKAGE or VERSION." + (match (available-updates package) + (() #f) + ((sources ...) + (if version + (find (lambda (source) + (string=? (upstream-source-version source) + version)) + sources) + (first sources))))) + +(define %test-updater + (upstream-updater + (name 'test) + (description "Pseudo updater for testing purposes.") + (pred test-package?) + (import import-release))) diff --git a/tests/guix-refresh.sh b/tests/guix-refresh.sh new file mode 100644 index 0000000000..de094a6c1d --- /dev/null +++ b/tests/guix-refresh.sh @@ -0,0 +1,117 @@ +# GNU Guix --- Functional package management for GNU +# Copyright © 2023 Ludovic Courtès +# +# This file is part of GNU Guix. +# +# GNU Guix is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# GNU Guix is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Guix. If not, see . + +# +# Test the 'guix refresh' command-line utility. +# + +guix refresh --version + +manifest="t-guix-refresh-manifest-$$.scm" +module_dir="t-guix-refresh-modules-$$" +trap 'rm -f "$manifest"; rm -rf "$module_dir"' EXIT + +# Tell the 'test' updater what to simulate. +export GUIX_TEST_UPDATER_TARGETS +idutils_version="$(guix package -A ^idutils$ | cut -f2)" +GUIX_TEST_UPDATER_TARGETS=' + (("guile" "3" (("12.5" "file:///dev/null") + ("1.6.4" "file:///dev/null"))) + ("libreoffice" "" (("1.0" "file:///dev/null"))) + ("idutils" "" (("'$idutils_version'" "file:///dev/null"))) + ("the-test-package" "" (("5.5" "file://'$PWD/$module_dir'/source"))))' + +# No newer version available. +! guix refresh -t test idutils +case "$(guix refresh -t test idutils 2>&1)" in + *"$idutils_version"*"already the latest version"*) true;; + *) false;; +esac +! guix refresh -t test libreoffice +case "$(guix refresh -t test libreoffice 2>&1)" in + *"greater than the latest known version"*"1.0"*) true;; + *) false;; +esac + +# Various ways to specify packages. +cat > "$manifest" <manifest (list "guile@3.0")) +EOF +default_IFS="$IFS" +IFS=X +for spec in "guile" \ + "guile@3.0" \ + "-eX(@ (gnu packages guile) guile-3.0)" \ + "-mX$manifest" \ + "guileX-r" \ + "-sXcore" +do + guix refresh -t test $spec + case "$(guix refresh -t test $spec 2>&1)" in + *"would be upgraded"*"12.5"*) + true;; + *) + false;; + esac +done +IFS="$default_IFS" + +# Actually updating. +mkdir "$module_dir" +echo hello > "$module_dir/source" +cat > "$module_dir/sample.scm"<&1)" in + *"failed to find"*"2.0.0"*) true;; + *) false;; +esac +for spec in "guile=1.6.4" "guile@3=1.6.4" +do + guix refresh -t test "$spec" + case "$(guix refresh -t test "$spec" 2>&1)" in + *"would be downgraded"*"1.6.4"*) true;; + *) false;; + esac +done + +# Listing updaters. This should work whether or not networking is available. +guix refresh --list-updaters