From patchwork Mon Dec 12 17:45:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 45213 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 526BF27BBEC; Mon, 12 Dec 2022 17:47:27 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 5BA4927BBE9 for ; Mon, 12 Dec 2022 17:47:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4mtM-0008Cv-FS; Mon, 12 Dec 2022 12:47: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 1p4mtK-0008CR-5J for guix-patches@gnu.org; Mon, 12 Dec 2022 12:47: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 1p4mtJ-0001zj-Td for guix-patches@gnu.org; Mon, 12 Dec 2022 12:47:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4mtJ-0001Zi-Pc for guix-patches@gnu.org; Mon, 12 Dec 2022 12:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60014] [PATCH] activation: make install-special-file match against pairs as well. Resent-From: mirai@makinata.eu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Dec 2022 17:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60014 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60014@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16708671846037 (code B ref -1); Mon, 12 Dec 2022 17:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2022 17:46:24 +0000 Received: from localhost ([127.0.0.1]:54358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4msh-0001ZI-UK for submit@debbugs.gnu.org; Mon, 12 Dec 2022 12:46:24 -0500 Received: from lists.gnu.org ([209.51.188.17]:40022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4msf-0001ZB-30 for submit@debbugs.gnu.org; Mon, 12 Dec 2022 12:46:22 -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 1p4mse-000887-RB for guix-patches@gnu.org; Mon, 12 Dec 2022 12:46:20 -0500 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p4msc-0001X0-BC for guix-patches@gnu.org; Mon, 12 Dec 2022 12:46:19 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 605C820491 for ; Mon, 12 Dec 2022 18:46:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 1349280096; Mon, 12 Dec 2022 18:46:05 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id tLSuHF4fyJbW; Mon, 12 Dec 2022 18:46:04 +0100 (CET) Received: from guix-nuc.home.arpa (bl12-93-156.dsl.telepac.pt [85.245.93.156]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 6D53580093; Mon, 12 Dec 2022 18:46:04 +0100 (CET) From: mirai@makinata.eu Date: Mon, 12 Dec 2022 17:45:47 +0000 Message-Id: <43e937e1625b47a80887e68847fb8a8811d3f39f.1670867103.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.107.241; envelope-from=mirai@makinata.eu; helo=smtpmciv5.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=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: , 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 From: Bruno Victal special-files is a list of 2-tuples (pairs) but matching against a non-list pair would fail as match-lambda was only matching against a list pattern. --- gnu/build/activation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 5fb5af5658b7575a945579a7cf51c193600b76bb diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index 10c9045740..d4a7559651 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -341,7 +341,7 @@ (define (activate-special-files special-files) " (define install-special-file (match-lambda - ((target file) + ((or (target file) (? pair? (= car target) (= cdr file))) (let ((pivot (string-append target ".new"))) (mkdir-p (dirname target)) (symlink file pivot)