diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-06-16 18:59:43 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-06-26 19:56:04 -0400 |
| commit | 6f6d525683d5731d55fcd801a66b078bd6ba8369 (patch) | |
| tree | c295db39d125280be618f4aa442f31445958c540 /lisp/emacs-lisp | |
| parent | 12c77f6918c4a60dbbae3f716a58300b4026e8da (diff) | |
| download | emacs-6f6d525683d5731d55fcd801a66b078bd6ba8369.tar.gz emacs-6f6d525683d5731d55fcd801a66b078bd6ba8369.tar.bz2 emacs-6f6d525683d5731d55fcd801a66b078bd6ba8369.zip | |
Detect a non-list package archive content properly (Bug#22311)
* lisp/emacs-lisp/package.el (package--download-one-archive): Use
`read' instead of `read-from-string'; the latter always returns a
cons, so the `listp' check on its return value doesn't make sense. It
was changed from `read' to `read-from-string' in 2015-04-01 "*
emacs-lisp/package.el: Implement asynchronous refreshing", but that
change was not needed because `read' works fine on strings as well as
buffers.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c56502236ee..576a9bc7e73 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1532,7 +1532,7 @@ similar to an entry in `package-alist'. Save the cached copy to (content (buffer-string)) (dir (expand-file-name (format "archives/%s" name) package-user-dir)) (local-file (expand-file-name file dir))) - (when (listp (read-from-string content)) + (when (listp (read content)) (make-directory dir t) (if (or (not package-check-signature) (member name package-unsigned-archives)) |