From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id IAtnCTszRmZLRQEAqHPOHw:P1 (envelope-from ) for ; Thu, 16 May 2024 18:24:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id IAtnCTszRmZLRQEAqHPOHw (envelope-from ) for ; Thu, 16 May 2024 18:24:27 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=iyTFEzmr; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715876667; a=rsa-sha256; cv=none; b=UJCLy3DMbLX1NrX7484FsZ1P+WMZU/dShoH9Fn7btfXclvpbapPkiU+U8LCnCdxRz4bTdz bwdAq0/UvJW3ra31LmLZkf3kPmBpSZAICAEwfMMuH3sVQD86sEz6jd5mGKkwnulGT2dby/ OrPpIiaGwDrqcHavMF1LkD2A7ZN9Ut+spUJaxSetK1DLwzfQrhndf9Gvcsnv9jrmUiQtEr Wt0kyVFRgxQedVCtG9VCZX+09MQLH7JVTrufE8GVXhPkjWwt8yTk0LAEqbEPeUJiMgq5Oe YAfh8FxdpuhhyjfOMx3rGC5ku9OjtJ8+38QVK4Kdjxk57r/VdHbPNGqrpUo6Tw== 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=iyTFEzmr; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715876667; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=k8iT21zeQLGC0Vr+H6EQGS90NfXT9IE6f45O/bmm6O4=; b=BUE95sSJ/6hWVXtXqRTUQ1z5U80AlCxKJxiwcTQeQvSr6LdrMSd3cPPYELDm9qIlYSHh1u UaPij5EOCVth7jYbEUeWcpW83E6rNRT9jBQadHIrqZ5CorUI3RqzDGL++DPVfM3MPulSC0 wmpxE6ELyV+ONCGujYnTDfcdTqT8o7E7FfXUI0jQRYGlnHS/SKy3JxcPdkRBz5cmTsdzHj 6RzwSZHYv7rmTsaWGp8Bt429kskGh3Zc69WbgYApLM9GGyjVxpqHtpj1YJJcIHeMiGK2my MK9wpbUmXqw8XDGZGC7N+RImeJ+tw2BxQsk/TqUNTzJlR4mBq7us/8bdtRwF7Q== 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 03FD81F65A for ; Thu, 16 May 2024 18:24:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7dty-0000Kw-2H; Thu, 16 May 2024 12:24:18 -0400 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 1s7dtg-0008RC-B6 for guix-patches@gnu.org; Thu, 16 May 2024 12:24:02 -0400 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 1s7dtf-0003Zg-F6 for guix-patches@gnu.org; Thu, 16 May 2024 12:24:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s7dth-0000W1-Ni for guix-patches@gnu.org; Thu, 16 May 2024 12:24:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70494] [PATCH 18/23] guix: http-client: Add network-error?. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 May 2024 16:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70494 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Cc: Josselin Poiret , 70494@debbugs.gnu.org, Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Ricardo Wurmus , Christopher Baines Received: via spool by 70494-submit@debbugs.gnu.org id=B70494.17158766251969 (code B ref 70494); Thu, 16 May 2024 16:24:01 +0000 Received: (at 70494) by debbugs.gnu.org; 16 May 2024 16:23:45 +0000 Received: from localhost ([127.0.0.1]:49683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7dtQ-0000Vh-M3 for submit@debbugs.gnu.org; Thu, 16 May 2024 12:23:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7dtP-0000Vb-Hj for 70494@debbugs.gnu.org; Thu, 16 May 2024 12:23:43 -0400 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 1s7dtH-0003Xw-SJ; Thu, 16 May 2024 12:23:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=k8iT21zeQLGC0Vr+H6EQGS90NfXT9IE6f45O/bmm6O4=; b=iyTFEzmrxUfqnsHptJ/Y FZf6dCJaworikmQwDdpmli1HgQ6O35mNQopcIxPe5WfRWWNd7ClLhZsZ3X7FmleJ4eAC0qoqwd7eQ VKqslv4UX0naAP1bIFzkf/U+NYtn2hdwY/aXsfvn3t7Ex6R3fX65K8eyhU0gqJbKHQlCCGsDV3lNv ucx2a3qDs8m81mMkYxmBt2H7KbX1v+OeD1S01w44qALJ4rdkVDFkv1Cw8xIvFbVfDG1CY3AhnveRe fIPdaXmhzv0DbeUUbsh5MXyKslVTxJIENP5AjMjpqNe8NmmOMDz9PVWrDNvFZWqDRH4GOUPhjBSjB MZcG23rqtZSc3Q==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Christopher Baines's message of "Sun, 21 Apr 2024 10:42:36 +0100") References: <87bk632h36.fsf@cbaines.net> Date: Thu, 16 May 2024 18:23:22 +0200 Message-ID: <87pltl9151.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 X-Migadu-Queue-Id: 03FD81F65A X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -5.77 X-Spam-Score: -5.77 X-TUID: nHcgUTLwPM8J Christopher Baines skribis: > Plus remove http-get-error? from network-error? as a http-get-error? does= n't > indicate a network error. > > * guix/scripts/substitute.scm (system-error?, network-error?): Move from = here. > (process-substitution/fallback, process-substitution): Use http-get-error? > with network-error?. > * guix/http-client.scm: To here, and also don't use http-get-error?. > > Change-Id: I61ee9e5fbf90ebb76a34aa8b9ec8f5d74f8a3c54 LGTM, but... > - (guard (c ((network-error? c) > + (guard (c ((or (http-get-error? c) > + (network-error? c)) > (when (http-get-error? c) > (warning (G_ "download from '~a' failed: ~a, = ~s~%") > (uri->string (http-get-error-uri c)) > @@ -663,7 +644,8 @@ (define* (process-substitution store-item destination > (let ((expected-hash > actual-hash > (guard > - (c ((network-error? c) > + (c ((or (http-get-error? c) > + (network-error? c)) These two hunks should probably go to a different commit, because they=E2=80=99re really fixing a bug. (The commit log subject line doesn=E2=80=99t need the =E2=80=9Cguix:=E2=80= =9D prefix.)