From: Richard Hopkins <emacs@unbit.co.uk>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 58367@debbugs.gnu.org
Subject: bug#58367: `package-install-file' rejects some .tar files (tentative patch)
Date: Sat, 08 Oct 2022 23:45:11 +0100 [thread overview]
Message-ID: <4315b955f7be21612324290ea97dcdc0@unbit.co.uk> (raw)
In-Reply-To: <jwvo7um1imt.fsf-monnier+emacs@gnu.org>
On 2022-10-08 17:25, Stefan Monnier wrote:
> Thanks for the tarballs for the tests, they were very helpful.
> The patch also pointed in the right direction.
>
> I installed the patch below (plus regression tests) into `master`.
Great, thanks for taking a look at this and also fixing the top level
lookup for v7-withsub-0.1.tar. I've pulled the latest changes and all
the original tar files now install.
I've managed to get the ustar-withsub-0.1 to install from a directory
and include the sub directories by using `copy-directory' instead of
only copying the .el files in the top level. As more inspiration...
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d619142d64..4144a12718 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -947,14 +947,10 @@ package-unpack
(pkg-dir (expand-file-name dirname package-user-dir)))
(pcase (package-desc-kind pkg-desc)
('dir
- (make-directory pkg-dir t)
(let ((file-list
- (directory-files
- default-directory 'full "\\`[^.].*\\.el\\'" 'nosort)))
- (dolist (source-file file-list)
- (let ((target-el-file
- (expand-file-name (file-name-nondirectory
source-file) pkg-dir)))
- (copy-file source-file target-el-file t)))
+ (directory-files-recursively
+ default-directory "." t)))
+ (copy-directory default-directory pkg-dir nil t
'copy-contents)
;; Now that the files have been installed, this package is
;; indistinguishable from a `tar' or a `single'. Let's make
;; things simple by ensuring we're one of them.
prev parent reply other threads:[~2022-10-08 22:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-07 21:15 bug#58367: `package-install-file' rejects some .tar files (tentative patch) Richard Hopkins
2022-10-08 13:28 ` Lars Ingebrigtsen
2022-10-08 13:55 ` Richard Hopkins
2022-10-08 16:25 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-10-08 22:45 ` Richard Hopkins [this message]
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://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4315b955f7be21612324290ea97dcdc0@unbit.co.uk \
--to=emacs@unbit.co.uk \
--cc=58367@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
/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/emacs.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).