From: Morgan.J.Smith@outlook.com
To: 51258@debbugs.gnu.org, paxton@riseup.net, liliana.prikler@gmail.com
Cc: Morgan Smith <Morgan.J.Smith@outlook.com>
Subject: bug#51258: [PATCH v2] gnu: emacs: Handle pdump filenames that contain a fingerprint
Date: Tue, 19 Oct 2021 15:10:09 -0400 [thread overview]
Message-ID: <BYAPR05MB40237D49F7DC95B8A0D77905C5BD9@BYAPR05MB4023.namprd05.prod.outlook.com> (raw)
In-Reply-To: <a31d056d98bc5617a40dada3de8aed87@riseup.net>
From: Morgan Smith <Morgan.J.Smith@outlook.com>
* gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Change regex to handle
filenames that have a fingerprint in them. Also remove #t at the end of the phase.
---
I'm a fan of your idea. I tested this patch and it seems to work as expected.
I do think that the fingerprint will never be a version and my original patch would've been fine. However, I'm not certain of that and there isn't a good reason to have a super precise regex here anyways.
gnu/packages/emacs.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6d9950d068..2aae21be6d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -183,14 +183,13 @@ (define* (emacs-byte-compile-directory dir)
(let* ((libexec (string-append (assoc-ref outputs "out")
"/libexec"))
;; each of these find-files should return one file
- (pdmp (find-files libexec "^emacs\\.pdmp$"))
+ (pdmp (find-files libexec "\\.pdmp$"))
(pdmp-real (find-files libexec
- "^\\.emacs\\.pdmp-real$")))
+ "\\.pdmp-real$")))
(for-each (lambda (wrapper real)
(delete-file wrapper)
(rename-file real wrapper))
- pdmp pdmp-real))
- #t))
+ pdmp pdmp-real))))
(add-after 'glib-or-gtk-wrap 'strip-double-wrap
(lambda* (#:key outputs #:allow-other-keys)
;; Directly copy emacs-X.Y to emacs, so that it is not wrapped
--
2.33.1
next prev parent reply other threads:[~2021-10-19 19:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-17 21:20 bug#51258: emacs-next/git-master broken due to pdmp file naming changes Paxton Evans
2021-10-18 23:50 ` bug#51258: [PATCH] gnu: emacs: Handle pdump filenames that contain a fingerprint Morgan.J.Smith
2021-10-19 18:45 ` Liliana Marie Prikler
2021-10-19 19:10 ` Morgan.J.Smith [this message]
2021-10-19 19:53 ` bug#51258: [PATCH v2] " Liliana Marie Prikler
2021-10-24 1:00 ` bug#51258: [PATCH v3] " Morgan.J.Smith
2021-10-24 8:52 ` Liliana Marie Prikler
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BYAPR05MB40237D49F7DC95B8A0D77905C5BD9@BYAPR05MB4023.namprd05.prod.outlook.com \
--to=morgan.j.smith@outlook.com \
--cc=51258@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=paxton@riseup.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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).