From: Alex Kost <alezost@gmail.com>
To: Arun Isaac <arunisaac@systemreboot.net>
Cc: 26802@debbugs.gnu.org
Subject: bug#26802: [PATCH 4/4] build: emacs: Fix `store-file->elisp-source-file'.
Date: Sun, 21 May 2017 11:33:45 +0300 [thread overview]
Message-ID: <87y3tqhamu.fsf@gmail.com> (raw)
In-Reply-To: <d2967ebb.AEMAKY-XG48AAAAAAAAAAAO9aM4AAAACwQwAAAAAAAW9WABZHIAS@mailjet.com> (Arun Isaac's message of "Wed, 17 May 2017 22:22:46 +0530")
Arun Isaac (2017-05-17 22:22 +0530) wrote:
> This prevents a ".el.el" extension for source files with no version number in
> their file name.
>
> * guix/build/emacs-build-system.scm (store-file->elisp-source-file): Remove
> ".el" extension from file name before splitting to name and version.
> ---
> guix/build/emacs-build-system.scm | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
> index 44e8b0d31..25a3beaa2 100644
> --- a/guix/build/emacs-build-system.scm
> +++ b/guix/build/emacs-build-system.scm
> @@ -47,10 +47,13 @@
> (define (store-file->elisp-source-file file)
> "Convert FILE, a store file name for an Emacs Lisp source file, into a file
> name that has been stripped of the hash and version number."
> - (let-values (((name version)
> - (package-name->name+version
> - (strip-store-file-name file))))
> - (string-append name ".el")))
> + (let ((extension ".el"))
> + (let-values (((name version)
> + (package-name->name+version
> + (strip-store-file-name
> + (string-drop-right
> + file (string-length extension))))))
> + (string-append name extension))))
>
> (define* (unpack #:key source #:allow-other-keys)
> "Unpack SOURCE into the build directory. SOURCE may be a compressed
Wow, I don't know if removing ".el" from a file name can be written in a
more simple way, but the point of the patch is great! I didn't realize
this problem could be fixed so easily. It looks good to me, thanks!
--
Alex
next prev parent reply other threads:[~2017-05-21 8:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170517165246.14042-1-arunisaac@systemreboot.net>
2017-05-17 16:52 ` bug#26802: [PATCH 2/4] guix: lint: Slightly simplify `check-source-file-name' Arun Isaac
2017-05-18 11:30 ` Ludovic Courtès
2017-05-18 18:00 ` Arun Isaac
2017-05-17 16:52 ` bug#26802: [PATCH 3/4] guix: lint: Check for version in source file name Arun Isaac
2017-05-18 11:32 ` Ludovic Courtès
2017-05-18 17:59 ` Arun Isaac
2017-05-21 9:00 ` Alex Kost
[not found] ` <f8951611.AEMAKbu9720AAAAAAAAAAAOzWv8AAAACwQwAAAAAAAW9WABZHeEw@mailjet.com>
2017-05-18 21:01 ` Ludovic Courtès
2017-05-21 8:44 ` Alex Kost
2017-05-17 16:52 ` bug#26802: [PATCH 4/4] build: emacs: Fix `store-file->elisp-source-file' Arun Isaac
2017-05-21 8:33 ` Alex Kost [this message]
2017-05-21 22:24 ` Ludovic Courtès
2017-05-22 23:10 ` Arun Isaac
[not found] ` <cu7shjwebd7.fsf@systemreboot.net>
2017-05-23 0:52 ` Arun Isaac
[not found] ` <95c4b155.AEQAKqmySzQAAAAAAAAAAAOzWv8AAAACwQwAAAAAAAW9WABZI4fH@mailjet.com>
2017-05-23 8:15 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y3tqhamu.fsf@gmail.com \
--to=alezost@gmail.com \
--cc=26802@debbugs.gnu.org \
--cc=arunisaac@systemreboot.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.