From patchwork Thu Jan 24 04:35:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 802 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 8D06616AA2; Thu, 24 Jan 2019 04:51:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 624A916A9D for ; Thu, 24 Jan 2019 04:51:10 +0000 (GMT) Received: from localhost ([127.0.0.1]:46482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmWyp-00074i-2r for patchwork@mira.cbaines.net; Wed, 23 Jan 2019 23:51:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmWym-00074c-8G for guix-patches@gnu.org; Wed, 23 Jan 2019 23:51:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmWyl-0002jn-2O for guix-patches@gnu.org; Wed, 23 Jan 2019 23:51:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43946) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmWyk-0002i1-Ph for guix-patches@gnu.org; Wed, 23 Jan 2019 23:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gmWyk-0007P2-Ji for guix-patches@gnu.org; Wed, 23 Jan 2019 23:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34187] [PATCH] gnu: emacs-ert-runner: Fix lisp directory warning. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Jan 2019 04:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34187 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34187@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154830541428391 (code B ref -1); Thu, 24 Jan 2019 04:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Jan 2019 04:50:14 +0000 Received: from localhost ([127.0.0.1]:43227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gmWxx-0007Np-Oq for submit@debbugs.gnu.org; Wed, 23 Jan 2019 23:50:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gmWxw-0007NZ-7x for submit@debbugs.gnu.org; Wed, 23 Jan 2019 23:50:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:50919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmWxq-0008EK-PW for submit@debbugs.gnu.org; Wed, 23 Jan 2019 23:50:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmWxp-0006oz-PD for guix-patches@gnu.org; Wed, 23 Jan 2019 23:50:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmWjh-0000zx-4J for guix-patches@gnu.org; Wed, 23 Jan 2019 23:35:32 -0500 Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]:32947) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmWjd-0000ih-2m for guix-patches@gnu.org; Wed, 23 Jan 2019 23:35:27 -0500 Received: by mail-io1-xd29.google.com with SMTP id t24so3627613ioi.0 for ; Wed, 23 Jan 2019 20:35:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=8x6b4alMDgWNuYwL/FyWB+q7HWNFSwtw46e4HRnps1A=; b=gii/ByxtbwqZ3pFT++d7+le6fxe+pvJ3nSMicUdtvUfvaef+GhZPA3Gkat3K5Rfn07 +sSxq2Nx8159+X+aKC/LGa52jrnxFbx9qwbaPT8RwgBzq7tCEiM/1Yhvurr3Be8LORPv HURRd7y4uFJPvtwJ3dlCqY88bVqS5Ce8PhJjYxRc1/gZto572ap75pS1osVti+eR30pf y9991ce69aYjTvClgG8xrML88sdWFevNMZqNiQ23+IJhhPFQkHw+X2s/nW/sp3ZW+1YK vj3EM0decD9mU3K5P+FjV24wiXfVVPQFLopaeRtz5u6+MfxrfqVB7Goxy4RV+Pe/DBFy At/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=8x6b4alMDgWNuYwL/FyWB+q7HWNFSwtw46e4HRnps1A=; b=MCIq+I3Hs2kb/fS85K53Cdt42NOszRVwn5pfMxd/mue4RkcbDl/CyHOWw/XcH2Ykaf yeCZpm0ojS1tr6mDBLmlL+H8h0YX1oAdeq7ikbY7xgBfNy0wpwlVQblEwdyhbII0gy7E cvc77mwFF30UvIfDg22BXCK6++8DBUHnZy9RJwigtgocjKyMHDzxWCDn7Nw8nRz4Dkq2 AO57PiP+SIN/roonn6YYPCCcM5DZq5L0Fkcf0vUOm0ro50b3tlL4rcfA5burEAMQsEkk YJIRmQNnb/TDmOWxMt8RVu5e194HUT9dpjjxyCv1/zoqWgx5crXnE/cGhm8jK7pNI0wq kfYg== X-Gm-Message-State: AHQUAubXxWlAXrhFCJp3yrKe8Amz3UjLnCRQBfgynZTDsS+j4U6s9bj5 0DFCkEKcjhDFTp1VDKRrHd6KiO1I X-Google-Smtp-Source: AHgI3IaVbWPNUPKuy1A9ZapZMfxl3DIDmfjlz7tPiN/ngif1+Ph/xoaTQkOOfZ4/7KnFCU8GGN72yg== X-Received: by 2002:a6b:e514:: with SMTP id y20mr2907429ioc.105.1548304521509; Wed, 23 Jan 2019 20:35:21 -0800 (PST) Received: from kwak ([157.52.5.144]) by smtp.gmail.com with ESMTPSA id o6sm8110420iom.74.2019.01.23.20.35.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Jan 2019 20:35:20 -0800 (PST) From: Maxim Cournoyer Date: Wed, 23 Jan 2019 23:35:19 -0500 Message-ID: <87pnsm4qrc.fsf@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Hello! This fixes an annoyance where a warning would be print every time ert-runner was executed, like: --8<---------------cut here---------------start------------->8--- ert-runner --version Warning: Lisp directory '/tmp/guix-build-emacs-ert-runner-0.7.0.drv-0/ert-runner.el-0.7.0': No such file or directory Option ‘--version‘ not available --8<---------------cut here---------------end--------------->8--- Thank you, Maxim From 532f0dfeaa5f9aa7c03916afc843d5556a12f53c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 22 Jan 2019 05:33:19 +0000 Subject: [PATCH] gnu: emacs-ert-runner: Fix lisp directory warning. This fixes the warning message such as: "Warning: Lisp directory '/tmp/guix-build-emacs-ert-runner-0.7.0-1.90b8fdd.drv-0/source': No such file or directory" that would be printed upon running ert-runner. * gnu/packages/emacs-xyz.scm (emacs-ert-runner)[modules]: Add (srfi srfi-1) to the list of used modules. [phases]{install-executable}: Compute SOURCE-DRV and filter it out from the paths composing the EMACSLOADPATH variable used in the wrapper. --- gnu/packages/emacs-xyz.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c98798c8d..7bacf4234 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6956,11 +6956,18 @@ Emacs.") ("emacs-s" ,emacs-s) ("emacs-shut-up" ,emacs-shut-up))) (arguments - `(#:phases + `(#:modules ((guix build emacs-build-system) + (guix build emacs-utils) + (guix build utils) + (srfi srfi-1)) ;for `remove' + #:phases (modify-phases %standard-phases (add-after 'install 'install-executable (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out")) + (source-drv (string-append + "/tmp/guix-build-" ,name "-" ,version + ".drv-0/source"))) (substitute* "bin/ert-runner" (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") (string-append "ERT_RUNNER=\"" out @@ -6969,7 +6976,11 @@ Emacs.") (install-file "bin/ert-runner" (string-append out "/bin")) (wrap-program (string-append out "/bin/ert-runner") (list "EMACSLOADPATH" ":" 'prefix - (string-split (getenv "EMACSLOADPATH") #\:))) + ;; Do not capture the transient source directory in + ;; the wrapper. + (remove (lambda (p) + (string=? p source-drv)) + (string-split (getenv "EMACSLOADPATH") #\:)))) #t)))) #:include (cons* "^reporters/.*\\.el$" %default-include))) (home-page "https://github.com/rejeep/ert-runner.el") -- 2.20.1