From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QNH/Fm3U2GXsXAEAe85BDQ:P1 (envelope-from ) for ; Fri, 23 Feb 2024 18:22:53 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id QNH/Fm3U2GXsXAEAe85BDQ (envelope-from ) for ; Fri, 23 Feb 2024 18:22:53 +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=GzCL7Tef; 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=1708708973; 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=pBvFW5X58Yj6UzAcMOyPBWYG8eYkh3aHq9EWBShwQXWjMiOqeYiudH76fi0xnQZtViEFcs +uhmbneyDXZ0FNnXFvZXlbjzp62l+/0082xKHVQugbQ6GdL4fVcPNOtY+Qa4i6bvbCVC+z DgSBUKtE/AiRhp4lI6QkaqTmeQ4aC2+Q9MojE83b0MMUjF46Ov+LT2WJ2vA5W6rdIp+cEu JPDg4NSa4pn8TyS60Ou9SLEAk3lApHGoL3Cm6M20TAS8Ee3UfGcOv2vlnqUm2eQAddfXSr FkaYF+qsXFUetd8OShUHG1yOKjcpIzWfP/HbC4gFjWgBWkWFLlRaN287P76Mcg== 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=GzCL7Tef; 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-Seal: i=1; s=key1; d=yhetil.org; t=1708708973; a=rsa-sha256; cv=none; b=g4Zop/ZkyQNMMvG47q+BAGacQr9ufSpVxaeIwK3cLAb21Xq1D2yDGhMaSJ7bvjG4Fry5JN r5sIdFxIy8uaUUvCWBsxKU/L8N/ifFkgdjl7/Tzd9uccKQ3mphT0GmvXbZwsfx09OWaeU3 rR7j1AXyLZedrgIoUp3KIWO7HufxU81akkQ32kAOiqt/sDZKDvXaAmC1zbwW1rgjzaeeoU ZR7TINWCswGOta1U6HKLKtlUTreDi4Lwx9zvCmgadHYpPmnQPrkzyv1osMifZsZc7hGXX+ +o1tC4lD40oUIJ2P2P5P7ta4iqU6KyoNyO7OYmcBas76+XUa8FhbysKWfNGIhw== 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 0CA763AFEA for ; Fri, 23 Feb 2024 18:22:53 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdYC1-0005iY-Sh; Fri, 23 Feb 2024 11:14:33 -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 1rdXtn-0002sD-Hh for guix-patches@gnu.org; Fri, 23 Feb 2024 10:55:44 -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 1rdXtl-0008Ub-K3; Fri, 23 Feb 2024 10:55:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdXu6-0002UM-Q9; Fri, 23 Feb 2024 10:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69328] [PATCH 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: Fri, 23 Feb 2024 15:56: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: 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.17087037329455 (code B ref 69328); Fri, 23 Feb 2024 15:56:02 +0000 Received: (at 69328) by debbugs.gnu.org; 23 Feb 2024 15:55:32 +0000 Received: from localhost ([127.0.0.1]:49676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdXta-0002SD-T1 for submit@debbugs.gnu.org; Fri, 23 Feb 2024 10:55:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdXnM-00021h-Oo for 69328@debbugs.gnu.org; Fri, 23 Feb 2024 10:49:08 -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 1rdXmt-00077I-Mi; Fri, 23 Feb 2024 10:48:35 -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=GzCL7TeftWwwA6aJ4gC8 +Zu7WYG6pLXWuXiV63CpCP/UG+kTY/GFOLfx/ki8MI/j0NY+6SyAhRYyXVt14/jl1qUCg/7QGS8HA Tkj5kENx9922O9sbLDvorKhyqdfKAGZUqL+1bIhv+xm8ZUxI8wvQMxh8u7LCRE9Y1GJBPh5I1IKf6 KU0A2ygNrzdMd1cljXPBzRSIxaIZvdsm5IR7j23P7VR0TgQsNyf79tYOfB0sLIw7qFLswcSzP87Ra vyXmICjctdGSDILTNZE1keouz3mKG+nybWZjd8GnatsnN6U6rYCkewnOoTLnGTRsLlPpHMpeYk0d+ vhOM27oy+spg4g==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 23 Feb 2024 16:48:06 +0100 Message-ID: <0f673f19854b1b4bab62e08d6ec336c7200b5857.1708697539.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.17 X-Spam-Score: -3.17 X-Migadu-Queue-Id: 0CA763AFEA X-Migadu-Scanner: mx11.migadu.com X-TUID: Yi4PMDnPEG/+ 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