From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: Morgan.J.Smith@outlook.com, 51258@debbugs.gnu.org, paxton@riseup.net
Subject: bug#51258: [PATCH] gnu: emacs: Handle pdump filenames that contain a fingerprint
Date: Tue, 19 Oct 2021 20:45:03 +0200 [thread overview]
Message-ID: <fb033300ef41fb9771513e502d88afbd09777738.camel@gmail.com> (raw)
In-Reply-To: <BYAPR05MB40235F9D0819D249C3E6FBA7C5BC9@BYAPR05MB4023.namprd05.prod.outlook.com>
Hi,
Am Montag, den 18.10.2021, 19:50 -0400 schrieb
Morgan.J.Smith@outlook.com:
> From: Morgan Smith <Morgan.J.Smith@outlook.com>
>
> * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Add regex to
> handle
> filenames that have a fingerprint in them
> ---
>
> Fixed your problem. Well it was also my problem. The regex is
> pretty simple but probably a little intimidating if you've never done
> it before. I highly recommend reading up on ERE's and BRE's from the
> POSIX specification if you have time. I still don't exactly know how
> guile does regex but knowing POSIX regex has served me quite well.
>
> I've tested this patch and it works great for me on the latest emacs
> commit. It should also be backwards compatible so that's nice.
>
>
> gnu/packages/emacs.scm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 6d9950d068..6ebcfecbc7 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -183,9 +183,10 @@ (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$"))
> + ;; there might be a fingerprint in the name
> + (pdmp (find-files libexec "^emacs(-
> [[:xdigit:]]+)?\\.pdmp$"))
> (pdmp-real (find-files libexec
> - "^\\.emacs\\.pdmp-
> real$")))
> + "^\\.emacs(-
> [[:xdigit:]]+)?\\.pdmp-real$")))
> (for-each (lambda (wrapper real)
> (delete-file wrapper)
> (rename-file real wrapper))
Hi, this might sound somewhat odd, but I think this solution could be a
little over-engineered (also it does not match the case where the
version is an actual version rather than a git hash). Perhaps instead
we ought to simply look for the .pdmp-real suffix, construct the old
file name and move the file back. WDYT?
next prev parent reply other threads:[~2021-10-19 18:46 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 [this message]
2021-10-19 19:10 ` bug#51258: [PATCH v2] " Morgan.J.Smith
2021-10-19 19:53 ` 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=fb033300ef41fb9771513e502d88afbd09777738.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=51258@debbugs.gnu.org \
--cc=Morgan.J.Smith@outlook.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).