From patchwork Sun Mar 5 10:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 47691 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 7F6F616D5C; Sun, 5 Mar 2023 10:57:19 +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=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 692EF16D50 for ; Sun, 5 Mar 2023 10:57:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYm36-0006Fq-78; Sun, 05 Mar 2023 05:57:04 -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 1pYm34-0006FR-RN for guix-patches@gnu.org; Sun, 05 Mar 2023 05:57: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 1pYm34-0007Y9-IX for guix-patches@gnu.org; Sun, 05 Mar 2023 05:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYm34-0002MR-En for guix-patches@gnu.org; Sun, 05 Mar 2023 05:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61977] [PATCH] channels: Raise an error if dependency's introduction is malformed Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Mar 2023 10:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61977 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61977@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16780138109051 (code B ref -1); Sun, 05 Mar 2023 10:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Mar 2023 10:56:50 +0000 Received: from localhost ([127.0.0.1]:38608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYm2r-0002Lv-SO for submit@debbugs.gnu.org; Sun, 05 Mar 2023 05:56:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:35362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYm2q-0002Ln-DY for submit@debbugs.gnu.org; Sun, 05 Mar 2023 05:56:48 -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 1pYm2q-000689-71 for guix-patches@gnu.org; Sun, 05 Mar 2023 05:56:48 -0500 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYm2o-0007Ve-Nw for guix-patches@gnu.org; Sun, 05 Mar 2023 05:56:47 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id C5EEC18530D; Sun, 5 Mar 2023 10:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1678013803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=JOpP7+pNfocM+n84MOV5dwBuavhS2IUmTE3PzMowikI=; b=fQkPX/idY3cRO62/5t0HPkOiKCh+Ysdn7vFEeMVkfqU6NOuE3u09B4r5y7zXODBJ83QI6v Tv/0GRThrUIXntL6HaMOeJ1en7odJMSVb+DXQkGqluLyG+ccJUGzWpCCUGPxy5Z6YObmLV RlhT9ivaqrtrh96C48X7DWlguIG+0fHwFLhGllAKq05GCSJYOy45flLJOIU3EnKPBGCoOc M6RgQJtYy8lkz5UFzu3SawkZOdZUdLkpleQ27VuCTgcfM/LSqRRYfMURDP7Wnti1m0RO4r 7IKPmQSsMwEomy2pCdbrIzr6Nheis/1NXS+2HJ+YAeftBLAmHO3/+xdq/Wl1fg== Date: Sun, 5 Mar 2023 11:56:09 +0100 Message-Id: MIME-Version: 1.0 Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: ++++ Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret 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/channels.scm (sexp->channel-introduction): Do it. --- guix/channels.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) base-commit: 2799ad44234be675f018115f99be98d2c9fd565d diff --git a/guix/channels.scm b/guix/channels.scm index d44e7a0a3a..fc2bf55d65 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -256,7 +256,14 @@ (define sexp->channel-introduction ('commit commit) ('signer signer) _ ...) (make-channel-introduction commit (openpgp-fingerprint signer))) - (x #f))) + (x (raise (condition + (&message + (message (format #f "channel dependency has an invalid\ + introduction field"))) + (&error-location + (location + (source-properties->location + (source-properties x))))))))) (define (read-channel-metadata port) "Read from PORT channel metadata in the format expected for the