From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#34187] [PATCH] gnu: emacs-ert-runner: Fix lisp directory warning. Resent-Message-ID: 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) 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 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34187@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-r= unner.el-0.7.0': No such file or directory Option =E2=80=98--version=E2=80=98 not available --8<---------------cut here---------------end--------------->8--- Thank you, Maxim --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-emacs-ert-runner-Fix-lisp-directory-warning.patch >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 --=-=-=--