[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

15/15: emacs-build-system: Fix 'package-name-version->elpa-name-version'

From: Mark H. Weaver
Subject: 15/15: emacs-build-system: Fix 'package-name-version->elpa-name-version'.
Date: Wed, 23 Sep 2015 21:39:20 +0000

mhw pushed a commit to branch mhw-core-updates
in repository guix.

commit eee402106a9aefad050abf475b388a8189299f04
Author: Mark H Weaver <address@hidden>
Date:   Wed Sep 23 17:34:54 2015 -0400

    emacs-build-system: Fix 'package-name-version->elpa-name-version'.
    Fixes a regression introduced in b7c7c03eb5e37fc3455e4e17b0898ffc4bca29c3.
    * guix/build/emacs-build-system.scm 
      Remove unused 'name' binding.  Do not abuse 'strip-store-file-name' to
      remove the "emacs-" prefix, which worked before b7c7c03eb5 but not after.
 guix/build/emacs-build-system.scm |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/guix/build/emacs-build-system.scm 
index cb5bde3..f0a9a6e 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -138,10 +138,9 @@ DIRS."
 (define (package-name-version->elpa-name-version name-ver)
   "Convert the Guix package NAME-VER to the corresponding ELPA name-version
 format.  Essnetially drop the prefix used in Guix."
-  (let ((name (strip-store-file-name name-ver)))
-    (if (emacs-package? name-ver)
-        (strip-store-file-name name-ver)
-        name-ver)))
+  (if (emacs-package? name-ver)  ; checks for "emacs-" prefix
+      (string-drop name-ver (string-length "emacs-"))
+      name-ver))
 (define (store-directory->elpa-name-version store-dir)
   "Given a store directory STORE-DIR return the part of the basename after the

reply via email to

[Prev in Thread] Current Thread [Next in Thread]