From patchwork Wed Apr 9 14:23:39 2025 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: 41499 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 16FAA27BC4B; Wed, 9 Apr 2025 15:25:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 BE8E627BC49 for ; Wed, 9 Apr 2025 15:25:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2WMd-0004Bn-90; Wed, 09 Apr 2025 10:25:15 -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 1u2WMT-00047C-0O for guix-patches@gnu.org; Wed, 09 Apr 2025 10:25:07 -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 1u2WMR-0002zB-Ui; Wed, 09 Apr 2025 10:25:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=rhI9CwQ2rXZA7G2pqrpoNcM35bWjAz2JiDILrj36Odg=; b=MbEpU/IKznNj4ujmhTjVNY1Qbd8WNXmQhoHOYNX148YwhUtlICgejXY4kj6BcCQomi6WgVapEnbzGuINxbFEA6G5OPfHbezIwECZGSO32ytIJO9GH7oaXqvjVaqhp8lxf6p4UWzg6Tz0UI6gjX+F7ROblUZ8VzynVpAMoWcne8LT25zjYYxlW4xCbkhJy+AYpsciVXL8RyWvoMFvHUVY6MbQuLYhCC1U+DxXA1CjSaVqHjMSoKX1d6wTo+0vonhKPLBjnYdbsDFLu5ZnXF8WIYbqOKl9qA9EtVZp3yroU2uJ9SK3jxeF2KNtGeWn45HZRlgbCOIf60HxnKGBjTthrA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2WMQ-0007WU-AF; Wed, 09 Apr 2025 10:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77680] [PATCH 3/4] substitutes: Ignore corrupt cached narinfos. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 14:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77680 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77680@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 77680-submit@debbugs.gnu.org id=B77680.174420866028809 (code B ref 77680); Wed, 09 Apr 2025 14:25:02 +0000 Received: (at 77680) by debbugs.gnu.org; 9 Apr 2025 14:24:20 +0000 Received: from localhost ([127.0.0.1]:40933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2WLk-0007Ua-DL for submit@debbugs.gnu.org; Wed, 09 Apr 2025 10:24:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46216) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2WLh-0007UF-Ns for 77680@debbugs.gnu.org; Wed, 09 Apr 2025 10:24:18 -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 1u2WLc-0002rN-9i; Wed, 09 Apr 2025 10:24:12 -0400 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=rhI9CwQ2rXZA7G2pqrpoNcM35bWjAz2JiDILrj36Odg=; b=MZSZsNnd5TStxyaisKXK WSbzXFdrRBFUtFlGT9Xz4yRM1BG/SdxPjRwk0++uJgUPti8xEH5Vueevqpu0cT67ewDFwpyyVnOi/ 9A0V3wGAK/eMMJqF4b5EiYtksRtPDi1uew64kL8qe81psziiyyu2Dd9czlFk2GEfuSF6jn3ziGPdE 0Or8UgvMJKMSMSCCfiXpNJhes3XQauIbyOskFYfhMdkwTDe70kFSGIJ8gwmgfW+rLScOIGhLONDlq rNwkVmAfGLKX1DxPvj2UzkFPXvFa090z7/hhUZ82dB8vmIryOb4aQmW1nOUFHcUt8d7pV+dDpP2Sr 8iW/ScCoERWGJA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 9 Apr 2025 16:23:39 +0200 Message-ID: <2774fbdd96e93995194d5f56bc3d328dc5905326.1744208418.git.ludo@gnu.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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/substitutes.scm (cached-narinfo): Wrap ‘read’ call in ‘false-if-exception’. Add catch-all ‘match’ clause. Change-Id: I2d776f64b6521f778b4ab3f956b35cdef2ddb383 --- guix/substitutes.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/substitutes.scm b/guix/substitutes.scm index 86b9f5472a..45c165e03e 100644 --- a/guix/substitutes.scm +++ b/guix/substitutes.scm @@ -300,7 +300,7 @@ (define (cached-narinfo cache-url path) (lambda () (call-with-input-file cache-file (lambda (p) - (match (read p) + (match (false-if-exception (read p)) (('narinfo ('version 2) ('cache-uri cache-uri) ('date date) ('ttl ttl) ('value #f)) @@ -315,7 +315,8 @@ (define (cached-narinfo cache-url path) (if (obsolete? date now ttl) (values #f #f) (values #t (string->narinfo value cache-uri)))) - (('narinfo ('version v) _ ...) + (_ + ;; Corrupt or incompatible cached entry. (values #f #f)))))) (lambda _ (values #f #f))))