[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/1] Strip parent path from package descriptions for reproduc
From: |
Stefan Monnier |
Subject: |
Re: [PATCH 1/1] Strip parent path from package descriptions for reproducibility |
Date: |
Thu, 12 Nov 2020 23:39:46 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
> I'm not sure this is suitable for Emacs proper, and it could likely
> use some improvement, but we've applied it in Debian for the time
> being in order to avoid introducing unreprodcible strings into
> generated packages.
Thanks, but I think the current master code made your code redundant
when the following patch was installed:
commit 1fc9de4b81ceacabef6aafe48ecaabaf76f34bb2
Author: Glenn Morris <rgm@gnu.org>
Date: Fri Oct 30 19:20:24 2020 -0700
Improve reproducibility of generated -pkg.el files
* lisp/emacs-lisp/package.el (package-generate-description-file):
Don't include the full name of the source file in the header,
since that varies non-reproducibly according to the build directory.
https://bugs.debian.org/972861
Note that elpa.gnu.org's admin/archive-contents.el does this by hand
and already only includes the nondirectory part.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -963,7 +963,8 @@
(write-region
(concat
";;; Generated package description from "
- (replace-regexp-in-string "-pkg\\.el\\'" ".el" pkg-file)
+ (replace-regexp-in-string "-pkg\\.el\\'" ".el"
+ (file-name-nondirectory pkg-file))
" -*- no-byte-compile: t -*-\n"
(prin1-to-string
(nconc
-- Stefan