From patchwork Wed Jun 23 06:45:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlo Zancanaro X-Patchwork-Id: 30635 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 0B4B327BC81; Wed, 23 Jun 2021 07:46:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6187327BC78 for ; Wed, 23 Jun 2021 07:46:09 +0100 (BST) Received: from localhost ([::1]:33630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvweG-00039S-Ba for patchwork@mira.cbaines.net; Wed, 23 Jun 2021 02:46:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvweA-00039K-44 for guix-patches@gnu.org; Wed, 23 Jun 2021 02:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvwe9-0004q9-Sl for guix-patches@gnu.org; Wed, 23 Jun 2021 02:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lvwe9-0001xn-PU for guix-patches@gnu.org; Wed, 23 Jun 2021 02:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49181] Fix missing phases in Emacs builds Resent-From: Carlo Zancanaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Jun 2021 06:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49181 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 49181@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16244307487521 (code B ref -1); Wed, 23 Jun 2021 06:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jun 2021 06:45:48 +0000 Received: from localhost ([127.0.0.1]:40310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvwds-0001x9-2l for submit@debbugs.gnu.org; Wed, 23 Jun 2021 02:45:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:49354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvwdq-0001x1-B6 for submit@debbugs.gnu.org; Wed, 23 Jun 2021 02:45:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvwdp-00037x-Ge for guix-patches@gnu.org; Wed, 23 Jun 2021 02:45:41 -0400 Received: from zancanaro.com.au ([45.76.117.151]:37592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvwdl-0004PD-C1 for guix-patches@gnu.org; Wed, 23 Jun 2021 02:45:41 -0400 Received: by zancanaro.com.au (Postfix, from userid 116) id 66AEE34D71; Wed, 23 Jun 2021 06:45:30 +0000 (UTC) Received: from jolteon (n49-177-243-126.bla4.nsw.optusnet.com.au [49.177.243.126]) by zancanaro.com.au (Postfix) with ESMTPSA id 5197B34A69 for ; Wed, 23 Jun 2021 06:45:29 +0000 (UTC) User-agent: mu4e 1.4.15; emacs 27.2 From: Carlo Zancanaro Date: Wed, 23 Jun 2021 16:45:28 +1000 Message-ID: <87k0mlaxkn.fsf@zancanaro.id.au> MIME-Version: 1.0 Received-SPF: pass client-ip=45.76.117.151; envelope-from=carlo@zancanaro.id.au; helo=zancanaro.com.au 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_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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi there! I went to install emacs-protobuf-mode today and found that the build wasn't working. I investigated and it looks like someone renamed the add-source-to-load-path phase to expand-load-path, but they left a few references behind. The first of my patches fixes that. The second of my patches is more controversial. It changes modify-phases to error out if the asked-for phase doesn't exist in add-before/add-after clauses. I think this is the right move, because it's hard to imagine when the default behaviour of "add to the end of the phases list" is helpful. In most cases the extra phases are setup/transformation phases that we need to run before the final "install" phase, so it's far more useful to fail early than to add these to the end of the phases list. Carlo From b272a65b12175a3d0354f18e19247f9ed72f5f8e Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Wed, 23 Jun 2021 15:59:37 +1000 Subject: [PATCH 2/2] guix: Make modify-phases error when adding before/after a missing phase * guix/build/utils.scm (alist-cons-before, alist-cons-after): Cause a match failure if the reference is not found, rather than appending to the alist. * tests/build-utils.scm: Update tests to match. --- guix/build/utils.scm | 15 +++++++++------ tests/build-utils.scm | 12 ++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 419c10195b..6e052a7ea1 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015, 2018 Mark H Weaver ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2021 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -571,18 +572,22 @@ effects, such as displaying warnings or error messages." (define* (alist-cons-before reference key value alist #:optional (key=? equal?)) "Insert the KEY/VALUE pair before the first occurrence of a pair whose key -is REFERENCE in ALIST. Use KEY=? to compare keys." +is REFERENCE in ALIST. Use KEY=? to compare keys. An error is raised when no +such pair exists." (let-values (((before after) (break (match-lambda ((k . _) (key=? k reference))) alist))) - (append before (alist-cons key value after)))) + (match after + ((reference after ...) + (append before (alist-cons key value (cons reference after))))))) (define* (alist-cons-after reference key value alist #:optional (key=? equal?)) "Insert the KEY/VALUE pair after the first occurrence of a pair whose key -is REFERENCE in ALIST. Use KEY=? to compare keys." +is REFERENCE in ALIST. Use KEY=? to compare keys. An error is raised when +no such pair exists." (let-values (((before after) (break (match-lambda ((k . _) @@ -590,9 +595,7 @@ is REFERENCE in ALIST. Use KEY=? to compare keys." alist))) (match after ((reference after ...) - (append before (cons* reference `(,key . ,value) after))) - (() - (append before `((,key . ,value))))))) + (append before (cons* reference `(,key . ,value) after)))))) (define* (alist-replace key value alist #:optional (key=? equal?)) "Replace the first pair in ALIST whose car is KEY with the KEY/VALUE pair. diff --git a/tests/build-utils.scm b/tests/build-utils.scm index 654b480ed9..c694b479b3 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -38,17 +38,17 @@ '((a . 1) (x . 42) (b . 2) (c . 3)) (alist-cons-before 'b 'x 42 '((a . 1) (b . 2) (c . 3)))) -(test-equal "alist-cons-before, reference not found" - '((a . 1) (b . 2) (c . 3) (x . 42)) - (alist-cons-before 'z 'x 42 '((a . 1) (b . 2) (c . 3)))) +(test-assert "alist-cons-before, reference not found" + (not (false-if-exception + (alist-cons-before 'z 'x 42 '((a . 1) (b . 2) (c . 3)))))) (test-equal "alist-cons-after" '((a . 1) (b . 2) (x . 42) (c . 3)) (alist-cons-after 'b 'x 42 '((a . 1) (b . 2) (c . 3)))) -(test-equal "alist-cons-after, reference not found" - '((a . 1) (b . 2) (c . 3) (x . 42)) - (alist-cons-after 'z 'x 42 '((a . 1) (b . 2) (c . 3)))) +(test-assert "alist-cons-after, reference not found" + (not (false-if-exception + (alist-cons-after 'z 'x 42 '((a . 1) (b . 2) (c . 3)))))) (test-equal "alist-replace" '((a . 1) (b . 77) (c . 3)) -- 2.32.0