GNU bug report logs -
#51258
emacs-next/git-master broken due to pdmp file naming changes
Previous Next
Reported by: Paxton Evans <paxton <at> riseup.net>
Date: Mon, 18 Oct 2021 04:00:04 UTC
Severity: normal
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
From: Morgan Smith <Morgan.J.Smith <at> 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
This bug report was last modified 3 years and 239 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.