From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id eEXzF2f95mVdXAEAe85BDQ:P1 (envelope-from ) for ; Tue, 05 Mar 2024 12:09:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id eEXzF2f95mVdXAEAe85BDQ (envelope-from ) for ; Tue, 05 Mar 2024 12:09:27 +0100 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=BrFcVwkJ; 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=1709636967; 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=ElMxgUvcBIC1vFL13ue8a05OA3nKi/YwTK46N47dER0=; b=GNbvSiCYZVyxvZ/1Ntzi+/W1DRhfH3/S1syqKOaJEc76q3CKICAgyuOF0ad16bqeG3NTH4 Djgf/MOeCvsR3AHs9eSHxaUg6j0qYvlL+zyFNQMBLvibZnUbhbBAmw6ZEnEGqzdS1WdGbU vzV19yl8RPW6O1r94XKAtk7YHQdGI/yeMAdYAzViLqRGfZtJAKBZkwdfQYNs+QAq1aa/Co Ld/sXQLbUYkZb+AcIVpHAvwZK+jPQhC7TEahoTYaqizCSXah/HJNJJEROy3yW+66SwVqRR 7QXQO2KMqJB3u33CeT2u0lMyw34v3CKkCjUOAlCVgM5jhfXRozM5/5LIkJXNyg== 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=BrFcVwkJ; 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=1709636967; a=rsa-sha256; cv=none; b=QGWBJTxHAZKvfXJEtsp+w3TD9zHT2kTEuRjYNDYZsxRKhkmMu/bSckUcJpmC2DdBY6gdlm Du7vZeBvaV9GItSLj2P3HWDx6uXGV5MHlKP2pKrGuam2GixvLWrjI+E6odccIXd36/8n4e S8n94l71NzIAov+djiCyGxalaBGxqsIai9RwOvIOzuFB5awpR95ep9OnQnl3hpF1bciJ0L zrHTFF8+KcoRR4bm3GMNowNwRB6PUUEZmwWEIksipyQ3XR1JepQN/GPUETTlzQclO2KeNy qxrCP8bp89n5XG4G76bP1qD07SN7UP27JeNyypbNC3qkx9XXlvXPDuVqNo5X9Q== 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 4218650BD9 for ; Tue, 5 Mar 2024 12:09:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhSe4-0002Fc-Jl; Tue, 05 Mar 2024 06:07:41 -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 1rhSe1-0001yG-HA for guix-patches@gnu.org; Tue, 05 Mar 2024 06:07:38 -0500 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 1rhSdz-00032A-VG; Tue, 05 Mar 2024 06:07:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhSeQ-000079-Uh; Tue, 05 Mar 2024 06:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69328] [PATCH v2 02/12] lint: archival: Fix crash in non-Git case. 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, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 05 Mar 2024 11:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69328 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69328@debbugs.gnu.org Cc: Timothy Sample , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69328-submit@debbugs.gnu.org id=B69328.1709636872308 (code B ref 69328); Tue, 05 Mar 2024 11:08:02 +0000 Received: (at 69328) by debbugs.gnu.org; 5 Mar 2024 11:07:52 +0000 Received: from localhost ([127.0.0.1]:46375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhSeF-0008WM-HI for submit@debbugs.gnu.org; Tue, 05 Mar 2024 06:07:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhSeD-0008Vp-JN for 69328@debbugs.gnu.org; Tue, 05 Mar 2024 06:07:50 -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 1rhSde-0002ua-2v; Tue, 05 Mar 2024 06:07:14 -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=ElMxgUvcBIC1vFL13ue8a05OA3nKi/YwTK46N47dER0=; b=BrFcVwkJrTJm0Vk5902t LDyeL+tEeyEjtl2rc45Ho6gMZlYaRTVjrnnRm+EikTYUJiMlF4BjL5Jle5VlMV2OV5LHNlo4kSFEa 8wbN3ZDD1fSCGsAwePPofS0QJ+RFEidi5tpugXYGqEgyhMrg0Q+d6Zgrd1ZXQtHpvBmJi1VUcffT4 FynaQi7/nmEQtlXrrlroK5JtoPHeRUZGF7yLK8SE9nZd45Zm2lon0BXsfPtV9/KhcWiyWwcehm8MS ooHgJKSggSL5M4lY5aVYvnQurh/vrnxFZEPhccxPbVMjdJz58LSZqJb8Zws6Jc6Bp1YI49HRpuqcD Pa3aRsF648aoCQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 5 Mar 2024 12:06:50 +0100 Message-ID: <395f0625fc5373cee2de0793a98ea57a4059cc7d.1709636144.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87o7btc5du.fsf@gnu.org> References: <87o7btc5du.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.67 X-Spam-Score: -4.67 X-Migadu-Queue-Id: 4218650BD9 X-Migadu-Scanner: mx13.migadu.com X-TUID: i74gk7lKhiJ5 Fixes a bug introduced in 29f3089c841f00144f24f5c32296aebf22d752cc where ‘guix lint -c archival guile-wisp’ (for instance) would crash with a match error because ‘lookup-by-nar-hash’ returns a string. * guix/lint.scm (check-archival): Add SWHID case in the non-Git case. Change-Id: I66fb060172d372041df47d90a14df168b0fa762d --- guix/lint.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/lint.scm b/guix/lint.scm index 84df171045..ad84048660 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -1736,6 +1736,8 @@ (define (check-archival package) (list id) #:field 'source))))))) ((? content?) + '()) + ((? string? swhid) '()))) '())) ((? local-file?) -- 2.41.0